mirror of
https://github.com/kevingruesser/bootstrap-vz.git
synced 2025-08-24 07:26:29 +00:00
Actually get MakeTarball to spit out the same sha twice in a row
This commit is contained in:
parent
d6e6dbb4ee
commit
3a95740e6c
1 changed files with 3 additions and 1 deletions
|
@ -25,7 +25,9 @@ class MakeTarball(Task):
|
||||||
from hashlib import sha1
|
from hashlib import sha1
|
||||||
import os.path
|
import os.path
|
||||||
executable, options, arguments = get_bootstrap_args(info)
|
executable, options, arguments = get_bootstrap_args(info)
|
||||||
tarball_id = sha1(repr(frozenset(options + arguments))).hexdigest()[0:8]
|
# 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)
|
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):
|
if os.path.isfile(info.tarball):
|
||||||
|
|
Loading…
Add table
Reference in a new issue