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

[Daniel Baumann]

Author: daniel
Date: 2007-04-09 15:59:20 +0000 (Mon, 09 Apr 2007)
New Revision: 993

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-09 15:52:53 UTC (rev 992)
+++ dists/trunk/live-helper/doc/ChangeLog	2007-04-09 15:59:20 UTC (rev 993)
@@ -2,6 +2,9 @@
 
 	* helpers/lh_config, make-live, functions/defaults.sh:
 	  - Added mode to distinguish between Debian and Ubuntu.
+	* helpers/lh_chroot_sources:
+	  - Added check for LIVE_MIRROR_BUILD* to be equal to
+	    LIVE_MIRROR_IMAGE*.
 
 2007-04-08  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-09 15:52:53 UTC (rev 992)
+++ dists/trunk/live-helper/helpers/lh_chroot_sources	2007-04-09 15:59:20 UTC (rev 993)
@@ -132,6 +132,13 @@
 		# Configure generic indices
 		if [ "${LH_APT_GENERIC}" = "enabled" ]
 		then
+			# Don't do anything if it's not required
+			if [ "${LIVE_MIRROR_BUILD}" = "${LIVE_MIRROR_IMAGE}" ] && \
+			[ "${LIVE_MIRROR_BUILD_SECURITY}" = "${LIVE_MIRROR_IMAGE_SECURITY}" ]
+			then
+				exit 0
+			fi
+
 			# Cleaning apt list cache
 			rm -rf chroot/var/lib/apt/lists
 			mkdir -p chroot/var/lib/apt/lists/partial