summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2013-11-04 09:44:01 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2013-11-04 09:44:01 +0100
commit1a33b7a5851f8b2e27c96c05e765ff66c3a91c51 (patch)
treeef8338fe9d72290da0cfadde1471a76ef5b0c351
parent0aa8289a3773fd8a3885090b72622c2f95ab099c (diff)
downloadvyos-live-build-1a33b7a5851f8b2e27c96c05e765ff66c3a91c51.tar.gz
vyos-live-build-1a33b7a5851f8b2e27c96c05e765ff66c3a91c51.zip
Simplifying package cache stanza in python bootstrap stubs.
-rwxr-xr-xcomponents/bootstrap_cdebootstrap3
-rwxr-xr-xcomponents/bootstrap_debootstrap3
2 files changed, 4 insertions, 2 deletions
diff --git a/components/bootstrap_cdebootstrap b/components/bootstrap_cdebootstrap
index 75c7b41bb..fc0b663d6 100755
--- a/components/bootstrap_cdebootstrap
+++ b/components/bootstrap_cdebootstrap
@@ -105,8 +105,9 @@ def main():
print('I: use \'lb clean\' to clean up a previously incomplete build')
sys.exit(1)
+
# packages cache
- elif glob.glob('cache/packages.bootstrap/*.deb'):
+ if glob.glob('cache/packages.bootstrap/*.deb'):
if verbose:
print('I: Copying cache/packages.bootstrap/*.deb to chroot/var/cache/bootstrap/*.deb')
diff --git a/components/bootstrap_debootstrap b/components/bootstrap_debootstrap
index 74805c6e5..2f5c128e7 100755
--- a/components/bootstrap_debootstrap
+++ b/components/bootstrap_debootstrap
@@ -110,8 +110,9 @@ def main():
print('I: use \'lb clean\' to clean up a previously incomplete build')
sys.exit(1)
+
# packages cache
- elif glob.glob('cache/packages.bootstrap/*.deb'):
+ if glob.glob('cache/packages.bootstrap/*.deb'):
if verbose:
print('I: Copying cache/packages.bootstrap/*.deb to chroot/var/cache/apt/archives/*.deb')