diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-02 12:12:54 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-04-23 17:05:38 +0200 |
| commit | fb41c190094040105ed57de0950d2d4af87f92b7 (patch) | |
| tree | a2bb257eaa8e519bc69200975ff7ed2e2457657c /scripts/build | |
| parent | e71db2bd58d1abdc6658db82642d9c614e9de2ec (diff) | |
| download | vyos-live-build-fb41c190094040105ed57de0950d2d4af87f92b7.tar.gz vyos-live-build-fb41c190094040105ed57de0950d2d4af87f92b7.zip | |
tidy version reported in `lb config --dump`
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]
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/config | 9 |
1 files changed, 3 insertions, 6 deletions
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) |