From fb41c190094040105ed57de0950d2d4af87f92b7 Mon Sep 17 00:00:00 2001
From: Lyndon Brown <jnqnfe@gmail.com>
Date: Thu, 2 Apr 2020 12:12:54 +0100
Subject: tidy version reported in `lb config --dump`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

live-build might be run from a local folder rather than the system
installation, so the dpkg version number should not override the version
picked up from VERSION

if we care about the possibility of the installed package version
potentially differing from the version of the git checkout, or
whatever, then this should be printed alongside it, as now done.

Gbp-Dch: Ignore

[Raphaël Hertzog: tweak to apply on top of my changes]
---
 scripts/build/config | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build/config b/scripts/build/config
index c4fd6cf2a..fcf186010 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -211,14 +211,11 @@ Local_arguments ()
 
 			--dump)
 				# Dump version
-				local VERSION_DPKG
-				if [ $(which dpkg-query) ]
-				then
-					VERSION_DPKG="$(dpkg-query -f='${Version}' --show live-build)"
+				Echo "This is live-build version %s" "${VERSION}"
+				if [ $(which dpkg-query) ]; then
+					Echo "Installed version reported by dpkg is %s" "$(dpkg-query -f='${Version}' --show live-build)"
 				fi
 
-				Echo "%s: This is live-build version %s" "${0}" "${VERSION_DPKG:-${VERSION}}"
-
 				# Dump conffile contents
 				Print_conffiles $(Common_config_files)
 
-- 
cgit v1.2.3