[Debian-live-changes] r1755 - dists/trunk/live-helper/helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-25 21:17:53 +0000 (Fri, 25 May 2007)
New Revision: 1755

Modified:
   dists/trunk/live-helper/helpers/lh_chroot_hooks
   dists/trunk/live-helper/helpers/lh_chroot_packages
   dists/trunk/live-helper/helpers/lh_chroot_packageslists
   dists/trunk/live-helper/helpers/lh_chroot_tasks
Log:


Modified: dists/trunk/live-helper/helpers/lh_chroot_hooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hooks	2007-05-25 21:13:58 UTC (rev 1754)
+++ dists/trunk/live-helper/helpers/lh_chroot_hooks	2007-05-25 21:17:53 UTC (rev 1755)
@@ -71,7 +71,7 @@
 	fi
 done
 
-if [ -n "${LIVE_HOOKS}" ]
+if [ -n "${LIVE_HOOKS}" ] && [ "${LIVE_HOOKS}" != "none" ]
 then
 	LIVE_DEBCONF_FRONTEND="readline" LIVE_DEBCONF_PRIORITY="low" LIVE_DEBCONF_NOWARNINGS="no" Chroot "${LIVE_HOOKS}"
 fi

Modified: dists/trunk/live-helper/helpers/lh_chroot_packages
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_packages	2007-05-25 21:13:58 UTC (rev 1754)
+++ dists/trunk/live-helper/helpers/lh_chroot_packages	2007-05-25 21:17:53 UTC (rev 1755)
@@ -46,7 +46,7 @@
 # Creating lock file
 Create_lockfile .lock
 
-if [ -n "${LIVE_PACKAGES}" ]
+if [ -n "${LIVE_PACKAGES}" ] && [ "${LIVE_PACKAGES}" != "none" ]
 then
 	# Restoring cache
 	Restore_cache cache/packages_packages

Modified: dists/trunk/live-helper/helpers/lh_chroot_packageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_packageslists	2007-05-25 21:13:58 UTC (rev 1754)
+++ dists/trunk/live-helper/helpers/lh_chroot_packageslists	2007-05-25 21:17:53 UTC (rev 1755)
@@ -46,7 +46,7 @@
 # Creating lock file
 Create_lockfile .lock
 
-if [ -n "${LIVE_PACKAGES_LISTS}" ]
+if [ -n "${LIVE_PACKAGES_LISTS}" ] && [ "${LIVE_PACKAGES_LISTS}" != "none" ]
 then
 	# Restoring cache
 	Restore_cache cache/packages_packageslists

Modified: dists/trunk/live-helper/helpers/lh_chroot_tasks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_tasks	2007-05-25 21:13:58 UTC (rev 1754)
+++ dists/trunk/live-helper/helpers/lh_chroot_tasks	2007-05-25 21:17:53 UTC (rev 1755)
@@ -46,7 +46,7 @@
 # Creating lock file
 Create_lockfile .lock
 
-if [ -n "${LIVE_TASKS}" ]
+if [ -n "${LIVE_TASKS}" ] && [ "${LIVE_TASKS}" != "none" ]
 then
 	# Restoring cache
 	Restore_cache cache/packages_tasks