diff options
| author | Chris Lamb <lamby@debian.org> | 2009-01-01 21:32:38 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:09:33 +0100 |
| commit | d8e52213999298860c0843e1ec935822e75f8acf (patch) | |
| tree | 993208d5de3e2cec048e54b849fd8973d7890cf7 /helpers | |
| parent | fc578d6ae6b273bc02538e8e69fa660f269e6dc0 (diff) | |
| download | live-build-d8e52213999298860c0843e1ec935822e75f8acf.zip live-build-d8e52213999298860c0843e1ec935822e75f8acf.tar.gz | |
Don't assume that if dpkg is installed, we'll actually get a live-helper version number from it.
Diffstat (limited to 'helpers')
| -rwxr-xr-x | helpers/lh_config | 6 |
1 files changed, 3 insertions, 3 deletions
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 |