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

[Daniel Baumann]

Author: daniel
Date: 2007-04-07 22:26:01 +0000 (Sat, 07 Apr 2007)
New Revision: 977

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:18:57 UTC (rev 976)
+++ dists/trunk/live-helper/doc/ChangeLog	2007-04-07 22:26:01 UTC (rev 977)
@@ -1,11 +1,13 @@
 2007-04-08  Daniel Baumann  <daniel at debian.org>
 
 	* helpers/lh_chroot_sources:
-	  - Moved check for local sources from
+	  - Moved check for local source lists from
 	    config/sources.lists.{build,image} to
 	    config/chroot_sources/*.{build,image}.
-	  - Added check for local keys in
-	    config/chroot_sources/*.{build,image}.gpg
+	  - Added check for local gpg keys in
+	    config/chroot_sources/*.{build,image}.gpg.
+	  - Added check for local keyring packages in
+	    config/chroot_sources/*.deb.
 
 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:18:57 UTC (rev 976)
+++ dists/trunk/live-helper/helpers/lh_chroot_sources	2007-04-07 22:26:01 UTC (rev 977)
@@ -91,6 +91,17 @@
 			done
 		fi
 
+		# Check local keyring packages
+		if ls config/chroot_sources/*.deb &> /dev/null
+		then
+			for PACKAGE in config/chroot_sources/*.deb
+			do
+				cp ${PACKAGE} chroot/root
+				Chroot "dpkg -i `basename ${PACKAGE}`"
+				rm -f chroot/root/`basename ${PACKAGE}`
+			done
+		fi
+
 		# Installing aptitude
 		if [ "${LH_APT}" = "apt" ]
 		then