sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix --version display

Browse Source 
We do not have the concept of "not installed" in v2, so remove the
obsolete code looking for a now non-existent variable.

Also, log the version at startup.  This can help when
debugging from logs

Change-Id: I964c4cf207c10666afc5bc7ab9f2bfb9b1897c1e
This commit is contained in:
Ian Wienand 2016-12-01 04:31:14 +00:00
parent 448a2602fe
commit 5adfc9365a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
diskimage_builder/lib/disk-image-create
View File

@ -104,11 +104,7 @@ function show_options () {
} }
function show_version() { function show_version() {
if [ -n "$_DIB_PYTHON_INSTALL" ]; then python -c "from diskimage_builder import version; print(version.version_info.version_string())"
python -c "from diskimage_builder import version; print(version.version_info.version_string())"
else
echo "diskimage-builder is not installed."
fi
} }
INSTALL_PACKAGES="" INSTALL_PACKAGES=""
@ -184,6 +180,8 @@ if [ "$IS_RAMDISK" == "1" ]; then
source $_LIB/ramdisk-functions source $_LIB/ramdisk-functions
fi fi
echo "diskimage-builder version $(show_version)"
# If no elements are specified theres no way we can succeed # If no elements are specified theres no way we can succeed
if [ -z "$*" ]; then if [ -z "$*" ]; then
echo "ERROR: At least one distribution root element must be specified" echo "ERROR: At least one distribution root element must be specified"