[SCM] live-helper branch, debian-next, updated. debian/2.0_a10-1-12-g9de680f

Daniel Baumann daniel at debian.org
Sun Apr 18 12:48:41 UTC 2010


The following commit has been merged in the debian-next branch:
commit 9de680f667a105bf090e2536f0b95f3a023c9e6a
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Apr 18 14:43:23 2010 +0200

    Making sure live-helper.sh is sourced early enough wrt/ auto scripts.

diff --git a/helpers/clean b/helpers/clean
index 77fa1ab..6cafc6d 100755
--- a/helpers/clean
+++ b/helpers/clean
@@ -9,6 +9,9 @@
 
 set -e
 
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+
 # Read meta config
 if [ "${1}" != "noauto" ] && [ -x auto/clean ]
 then
@@ -21,9 +24,6 @@ then
 	shift
 fi
 
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
 # Setting static variables
 DESCRIPTION="$(Echo 'clean up system build directories')"
 HELP=""
diff --git a/helpers/config b/helpers/config
index e2eff08..a341af6 100755
--- a/helpers/config
+++ b/helpers/config
@@ -9,6 +9,9 @@
 
 set -e
 
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+
 # Read meta config
 if [ "${1}" != "noauto" ] && [ -x auto/config ]
 then
@@ -21,9 +24,6 @@ then
 	shift
 fi
 
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
 # Setting static variables
 SYSTEM_LH_CONFFILE="/etc/default/live-helper"
 DESCRIPTION="$(Echo 'create configuration for live-helper(7)')"

-- 
live-helper



More information about the debian-live-changes mailing list