[SCM] Debian Live build scripts branch, master, updated. 1.0.2-2-5-g28c4d28

[Chris Lamb]

The following commit has been merged in the master branch:
commit 54459bfbad855546e093cb6a583c979039e4a05c
Author: Chris Lamb <lamby at debian.org>
Date:   Thu Jan 1 21:32:38 2009 +0000

    Don't assume that if dpkg is installed, we'll actually get a live-helper version number from it.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/helpers/lh_config b/helpers/lh_config
index 886113d..b9354e0 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -155,11 +155,11 @@ Local_arguments ()
 				# Dump version
 				if [ -x "$(which dpkg-query 2>/dev/null)" ]
 				then
-					echo "${0}: This is live-helper version $(dpkg-query -f='${Version}') --show live-helper"
-				else
-					echo "${0}: This is live-helper version ${VERSION}"
+					VERSION_DPKG="$(dpkg-query -f='${Version}' --show live-helper)"
 				fi
 
+				echo "${0}: This is live-helper version ${VERSION_DPKG:-${VERSION}}"
+
 				# Dump conffile contents
 				Print_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 

-- 
Debian Live build scripts