kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 07:26:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix weird exit status from debootstrap

Browse source
This commit is contained in:
Anders Ingemann 2013-07-07 21:59:50 +02:00
parent 6f7978a465
commit d6e6dbb4ee
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
providers/ec2/tasks/bootstrap.py
View file

@ -1,6 +1,6 @@
from base import Task from base import Task
from common import phases from common import phases
from common.tools import log_check_call from common.exceptions import TaskError
import logging import logging
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -31,7 +31,11 @@ class MakeTarball(Task):
if os.path.isfile(info.tarball): if os.path.isfile(info.tarball):
log.debug('Found matching tarball, skipping download') log.debug('Found matching tarball, skipping download')
else: else:
log_check_call(executable + options + ['--make-tarball=' + info.tarball] + arguments) from common.tools import log_call
status, out, err = log_call(executable + options + ['--make-tarball=' + info.tarball] + arguments)
if status != 1:
msg = 'debootstrap exited with status {status}, it should exit with status 1'.format(status=status)
raise TaskError(msg)
class Bootstrap(Task): class Bootstrap(Task):
@ -44,4 +48,5 @@ class Bootstrap(Task):
if hasattr(info, 'tarball'): if hasattr(info, 'tarball'):
options.extend(['--unpack-tarball=' + info.tarball]) options.extend(['--unpack-tarball=' + info.tarball])
from common.tools import log_check_call
log_check_call(executable + options + arguments) log_check_call(executable + options + arguments)