[SCM] live-build branch, debian, updated. debian/3.0_a28-1-5-g89a66b4
Daniel Baumann
daniel at debian.org
Sat Aug 13 06:31:05 UTC 2011
The following commit has been merged in the debian branch:
commit 557e4c365b4f6742c7c95d458758a72a11331b89
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Aug 9 13:05:29 2011 +0200
Also guarding key additions for local configured archives to not fail if no key is supplied.
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 7bbbba7..c4ff532 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -477,9 +477,12 @@ EOF
for FILE in config/archives/*.key \
config/archives/*.key.chroot
do
- cp ${FILE} chroot/root
- Chroot chroot "apt-key add /root/$(basename ${FILE})"
- rm -f chroot/root/$(basename ${FILE})
+ if [ -e "${FILE}" ]
+ then
+ cp ${FILE} chroot/root
+ Chroot chroot "apt-key add /root/$(basename ${FILE})"
+ rm -f chroot/root/$(basename ${FILE})
+ fi
done
fi
@@ -806,9 +809,12 @@ EOF
for FILE in config/archives/*.key \
config/archives/*.key.binary
do
- cp ${FILE} chroot/root
- Chroot chroot "apt-key add /root/$(basename ${FILE})"
- rm -f chroot/root/$(basename ${FILE})
+ if [ -e "${FILE}" ]
+ then
+ cp ${FILE} chroot/root
+ Chroot chroot "apt-key add /root/$(basename ${FILE})"
+ rm -f chroot/root/$(basename ${FILE})
+ fi
done
fi
--
live-build
More information about the debian-live-changes
mailing list