[Debian-live-changes] r976 - in dists/trunk/live-helper: doc helpers

[Daniel Baumann]

Author: daniel
Date: 2007-04-07 22:18:57 +0000 (Sat, 07 Apr 2007)
New Revision: 976

Modified:
   dists/trunk/live-helper/doc/ChangeLog
   dists/trunk/live-helper/helpers/lh_chroot_sources
Log:


Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog	2007-04-07 22:12:27 UTC (rev 975)
+++ dists/trunk/live-helper/doc/ChangeLog	2007-04-07 22:18:57 UTC (rev 976)
@@ -1,8 +1,11 @@
 2007-04-08  Daniel Baumann  <daniel at debian.org>
 
 	* helpers/lh_chroot_sources:
-	  - Moved check for local from config/sources.lists.{build,image} to
+	  - Moved check for local sources from
+	    config/sources.lists.{build,image} to
 	    config/chroot_sources/*.{build,image}.
+	  - Added check for local keys in
+	    config/chroot_sources/*.{build,image}.gpg
 
 2007-04-06  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources	2007-04-07 22:12:27 UTC (rev 975)
+++ dists/trunk/live-helper/helpers/lh_chroot_sources	2007-04-07 22:18:57 UTC (rev 976)
@@ -80,6 +80,17 @@
 			done
 		fi
 
+		# Check local gpg keys
+		if ls config/chroot_sources/*.build.gpg &> /dev/null
+		then
+			for FILE in config/chroot_sources/*.build.gpg
+			do
+				cp ${FILE} chroot/root
+				Chroot "apt-key add /root/`basename ${FILE}`"
+				rm -f chroot/root/`basename ${FILE}`
+			done
+		fi
+
 		# Installing aptitude
 		if [ "${LH_APT}" = "apt" ]
 		then
@@ -139,6 +150,17 @@
 				done
 			fi
 
+			# Check local gpg keys
+			if ls config/chroot_sources/*.image.gpg &> /dev/null
+			then
+				for FILE in config/chroot_sources/*.image.gpg
+				do
+					cp ${FILE} chroot/root
+					Chroot "apt-key add /root/`basename ${FILE}`"
+					rm -f chroot/root/`basename ${FILE}`
+				done
+			fi
+
 			case "${LH_APT}" in
 				apt|apt-get)
 					Chroot "apt-get update"