[SCM] live-build branch, debian-next, updated. debian/3.0_a54-1-20-gcdf1bca
Daniel Baumann
daniel at debian.org
Sat Jul 28 22:35:55 UTC 2012
The following commit has been merged in the debian-next branch:
commit cdf1bca4867ad78c923637860f00131e13bbd839
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 29 00:36:49 2012 +0200
Optimizing chroot package-lists handling for the cases where it's not used.
diff --git a/scripts/build/lb_chroot_package-lists b/scripts/build/lb_chroot_package-lists
index 4e3aab0..f38fff7 100755
--- a/scripts/build/lb_chroot_package-lists
+++ b/scripts/build/lb_chroot_package-lists
@@ -41,20 +41,20 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking depends
-Check_package chroot/usr/bin/grep-aptavail dctrl-tools
-
-# Restoring cache
-Restore_cache cache/packages.chroot
-
-# Installing depends
-Install_package
-
# Handling local package lists
if ls config/package-lists/*.list > /dev/null 2>&1 || \
ls config/package-lists/*.list.chroot > /dev/null 2>&1 || \
ls config/package-lists/*.list.chroot_${_PASS} > /dev/null 2>&1
then
+ # Checking depends
+ Check_package chroot/usr/bin/grep-aptavail dctrl-tools
+
+ # Restoring cache
+ Restore_cache cache/packages.chroot
+
+ # Installing depends
+ Install_package
+
for LIST in config/package-lists/*.list \
config/package-lists/*.list.chroot \
config/package-lists/*.list.chroot_${_PASS}
@@ -67,16 +67,16 @@ then
fi
done
- # Creating stage file
- Create_stagefile .build/chroot_package-lists.${_PASS}
-fi
+ # Removing dctrl-tools again if the user has not installed it
+ if ! grep -qs dctrl-tools chroot/root/packages.chroot
+ then
+ # Removing depends
+ Remove_package
+ fi
-# Saving cache
-Save_cache cache/packages.binary
+ # Saving cache
+ Save_cache cache/packages.binary
-# Removing dctrl-tools again if the user has not installed it
-if ! grep -qs dctrl-tools chroot/root/packages.chroot
-then
- # Removing depends
- Remove_package
+ # Creating stage file
+ Create_stagefile .build/chroot_package-lists.${_PASS}
fi
--
live-build
More information about the debian-live-changes
mailing list