[SCM] live-helper branch, debian-next, updated. debian/2.0_a9-1-14-g3878be0
Daniel Baumann
daniel at debian.org
Fri Apr 9 18:59:49 UTC 2010
The following commit has been merged in the debian-next branch:
commit 3878be04c0007f196b004dca164c9e792cf02e3c
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Apr 9 20:54:44 2010 +0200
Adding --repositories, part 4.
diff --git a/helpers/chroot_sources b/helpers/chroot_sources
index 7a59a25..1ba1f51 100755
--- a/helpers/chroot_sources
+++ b/helpers/chroot_sources
@@ -125,6 +125,7 @@ case "${1}" in
then
for REPOSITORY in ${LH_REPOSITORIES}
do
+ # Adding sources.list entries (chroot)
if [ -e "${LH_BASE}/repositories/${REPOSITORY}.chroot" ]
then
sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
@@ -138,6 +139,18 @@ case "${1}" in
"${LH_BASE}/repositories/${REPOSITORY}" > \
"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
fi
+
+ if [ "${LH_APT_SECURE}" != false ]
+ then
+ # Adding archive signing keys (chroot)
+ if [ -e "${LH_BASE}/repositores/${REPOSITORY}.chroot.gpg" ]
+ then
+ cat "${LH_BASE}/repositores/${REPOSITORY}.gpg" | Chroot "apt-key add -"
+ elif [ -e "${LH_BASE}/repositores/${REPOSITORY}.gpg" ]
+ then
+ cat "${LH_BASE}/repositores/${REPOSITORY}.chroot.gpg" | Chroot "apt-key add -"
+ fi
+ fi
done
fi
@@ -479,8 +492,10 @@ case "${1}" in
then
for REPOSITORY in ${LH_REPOSITORIES}
do
+ # Removing sources.list entries (chroot)
rm -f "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
+ # Adding sources.list entries (binary)
if [ -e "${LH_BASE}/repositories/${REPOSITORY}.binary" ]
then
sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
@@ -494,6 +509,18 @@ case "${1}" in
"${LH_BASE}/repositories/${REPOSITORY}" > \
"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
fi
+
+ if [ "${LH_APT_SECURE}" != false ]
+ then
+ # Adding archive signing keys (binary)
+ if [ -e "${LH_BASE}/repositores/${REPOSITORY}.binary.gpg" ]
+ then
+ cat "${LH_BASE}/repositores/${REPOSITORY}.gpg" | Chroot "apt-key add -"
+ elif [ -e "${LH_BASE}/repositores/${REPOSITORY}.gpg" ]
+ then
+ cat "${LH_BASE}/repositores/${REPOSITORY}.binary.gpg" | Chroot "apt-key add -"
+ fi
+ fi
done
fi
diff --git a/examples/sources/debian-live_sid-snapshots.gpg b/repositories/backports.debian-maintainers.org.gpg
similarity index 96%
copy from examples/sources/debian-live_sid-snapshots.gpg
copy to repositories/backports.debian-maintainers.org.gpg
index e817812..7f9b836 100644
--- a/examples/sources/debian-live_sid-snapshots.gpg
+++ b/repositories/backports.debian-maintainers.org.gpg
@@ -1,5 +1,5 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
mQENBEtljiMBCADSIplButAWL0OuM4uvDtZYjBcPlQNjwQDZ/Dpg5QuRAgNSUdx7
wBQOQXqC4LCi9ykpvYi8FEtz0bl60M9uJdc4n+130It8gSZs7Cn0WoFk7uo0S4IS
diff --git a/examples/sources/debian-live_sid-snapshots.gpg b/repositories/live.debian.net.gpg
similarity index 96%
copy from examples/sources/debian-live_sid-snapshots.gpg
copy to repositories/live.debian.net.gpg
index e817812..7f9b836 100644
--- a/examples/sources/debian-live_sid-snapshots.gpg
+++ b/repositories/live.debian.net.gpg
@@ -1,5 +1,5 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
mQENBEtljiMBCADSIplButAWL0OuM4uvDtZYjBcPlQNjwQDZ/Dpg5QuRAgNSUdx7
wBQOQXqC4LCi9ykpvYi8FEtz0bl60M9uJdc4n+130It8gSZs7Cn0WoFk7uo0S4IS
diff --git a/examples/sources/debian-live_sid-snapshots.gpg b/repositories/unofficial.debian-maintainers.org.gpg
similarity index 96%
copy from examples/sources/debian-live_sid-snapshots.gpg
copy to repositories/unofficial.debian-maintainers.org.gpg
index e817812..7f9b836 100644
--- a/examples/sources/debian-live_sid-snapshots.gpg
+++ b/repositories/unofficial.debian-maintainers.org.gpg
@@ -1,5 +1,5 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
mQENBEtljiMBCADSIplButAWL0OuM4uvDtZYjBcPlQNjwQDZ/Dpg5QuRAgNSUdx7
wBQOQXqC4LCi9ykpvYi8FEtz0bl60M9uJdc4n+130It8gSZs7Cn0WoFk7uo0S4IS
--
live-helper
More information about the debian-live-changes
mailing list