kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-22 09:50:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bootstrap method searches for an existing tarball

Browse source 
The tarball bootstrap method now uses an existing tarball if it is
found, regardless of its settings on the manifest, although it will
create a new one only if `"tarball"` is `true`.

This closes #24.
This commit is contained in:
Tiago Ilieve 2014-04-26 13:49:47 -03:00
parent 33d2e1df61
commit 1d36255a78
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
bootstrapvz/common/tasks/bootstrap.py
View file

@ -3,6 +3,7 @@ from .. import phases
from ..exceptions import TaskError
import host
import logging
import os.path
log = logging.getLogger(__name__)
@ -28,22 +29,26 @@ def get_bootstrap_args(info):
return executable, options, arguments
def get_tarball_filename(info):
from hashlib import sha1
executable, options, arguments = get_bootstrap_args(info)
# Filter info.root which points at /target/volume-id, we won't ever hit anything with that in there.
hash_args = [arg for arg in arguments if arg != info.root]
tarball_id = sha1(repr(frozenset(options + hash_args))).hexdigest()[0:8]
tarball_filename = 'debootstrap-{id}.tar'.format(id=tarball_id)
return os.path.join(info.manifest.bootstrapper['workspace'], tarball_filename)
class MakeTarball(Task):
description = 'Creating bootstrap tarball'
phase = phases.os_installation
@classmethod
def run(cls, info):
from hashlib import sha1
import os.path
executable, options, arguments = get_bootstrap_args(info)
# Filter info.root which points at /target/volume-id, we won't ever hit anything with that in there.
hash_args = [arg for arg in arguments if arg != info.root]
tarball_id = sha1(repr(frozenset(options + hash_args))).hexdigest()[0:8]
tarball_filename = 'debootstrap-{id}.tar'.format(id=tarball_id)
info.tarball = os.path.join(info.manifest.bootstrapper['workspace'], tarball_filename)
info.tarball = get_tarball_filename(info)
if os.path.isfile(info.tarball):
log.debug('Found matching tarball, skipping download')
log.debug('Found matching tarball, skipping creation')
else:
from ..tools import log_call
status, out, err = log_call(executable + options + ['--make-tarball=' + info.tarball] + arguments)
@ -60,7 +65,11 @@ class Bootstrap(Task):
@classmethod
def run(cls, info):
executable, options, arguments = get_bootstrap_args(info)
if hasattr(info, 'tarball'):
info.tarball = get_tarball_filename(info)
if os.path.isfile(info.tarball):
if not info.manifest.bootstrapper.get('tarball', False):
# Only shows this message if it hasn't tried to create the tarball
log.debug('Found matching tarball, skipping download')
options.extend(['--unpack-tarball=' + info.tarball])
from ..tools import log_check_call