[SCM] live-build branch, debian, updated. debian/3.0_a34-1-10-gf2132fc
Daniel Baumann
daniel at debian.org
Sat Oct 8 09:03:36 UTC 2011
The following commit has been merged in the debian branch:
commit fc0d34a31bbdad97344b2fc783c2cb80ff666aec
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Sep 30 15:42:51 2011 +0200
Making top sources.list conditional, not everyone necessarily always uses that.
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 200b20d..7e029d7 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -432,7 +432,10 @@ EOF
echo "deb file:/root/packages ./" > chroot/etc/apt/sources.list.d/packages.list
# Move top-level sources away, otherwise apt always preferes it, even for local packages
- mv chroot/etc/apt/sources.list chroot/etc/apt/sources.list.d/zz-sources.list
+ if [ -e chroot/etc/apt/sources.list ]
+ then
+ mv chroot/etc/apt/sources.list chroot/etc/apt/sources.list.d/zz-sources.list
+ fi
# Removing depends
Remove_package
@@ -593,7 +596,10 @@ EOF
Create_lockfile .lock
# Restore top-level sources
- mv chroot/etc/apt/sources.list.d/zz-sources.list chroot/etc/apt/sources.list
+ if [ -e chroot/etc/apt/sources.list.d/zz-sources.list ]
+ then
+ mv chroot/etc/apt/sources.list.d/zz-sources.list chroot/etc/apt/sources.list
+ fi
# Configure generic indices
# Don't do anything if it's not required
--
live-build
More information about the debian-live-changes
mailing list