mirror of
https://github.com/kevingruesser/bootstrap-vz.git
synced 2025-08-24 15:36:27 +00:00
Actually make MakeTarball useful
This commit is contained in:
parent
be387673c0
commit
6f7978a465
1 changed files with 7 additions and 5 deletions
|
@ -1,6 +1,8 @@
|
||||||
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.tools import log_check_call
|
||||||
|
import logging
|
||||||
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
def get_bootstrap_args(info):
|
def get_bootstrap_args(info):
|
||||||
|
@ -26,9 +28,10 @@ class MakeTarball(Task):
|
||||||
tarball_id = sha1(repr(frozenset(options + arguments))).hexdigest()[0:8]
|
tarball_id = sha1(repr(frozenset(options + arguments))).hexdigest()[0:8]
|
||||||
tarball_filename = 'debootstrap-{id}.tar'.format(id=tarball_id)
|
tarball_filename = 'debootstrap-{id}.tar'.format(id=tarball_id)
|
||||||
info.tarball = os.path.join(info.manifest.bootstrapper['tarball_dir'], tarball_filename)
|
info.tarball = os.path.join(info.manifest.bootstrapper['tarball_dir'], tarball_filename)
|
||||||
|
if os.path.isfile(info.tarball):
|
||||||
command = executable + options + ['--make-tarball=' + info.tarball] + arguments
|
log.debug('Found matching tarball, skipping download')
|
||||||
log_check_call(command)
|
else:
|
||||||
|
log_check_call(executable + options + ['--make-tarball=' + info.tarball] + arguments)
|
||||||
|
|
||||||
|
|
||||||
class Bootstrap(Task):
|
class Bootstrap(Task):
|
||||||
|
@ -41,5 +44,4 @@ class Bootstrap(Task):
|
||||||
if hasattr(info, 'tarball'):
|
if hasattr(info, 'tarball'):
|
||||||
options.extend(['--unpack-tarball=' + info.tarball])
|
options.extend(['--unpack-tarball=' + info.tarball])
|
||||||
|
|
||||||
command = executable + options + arguments
|
log_check_call(executable + options + arguments)
|
||||||
log_check_call(command)
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue