summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2018-05-31 14:44:36 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2018-05-31 12:56:13 +0000
commit3ee0e4ef37516cf29cab6d3962311b2266365bab (patch)
treed5f1774cb410274dfe1c806b22dbf8ad56f0ac5e
parentf71e58336b34940782d9742a1b9b4e413f525f0a (diff)
Fix minor get_package_version issue
The function didn't check the value of pre_release_version_type when printing the version. Change-Id: I29db3f40e6fa8c397432433aa285b30f15b8e3ca Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
-rw-r--r--build_scripts/main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py
index 9f7c4e4c..f288756c 100644
--- a/build_scripts/main.py
+++ b/build_scripts/main.py
@@ -64,7 +64,7 @@ def get_package_version():
d['major_version'], d['minor_version'], d['patch_version'])
pre_release_version_type = d['pre_release_version_type']
pre_release_version = d['pre_release_version']
- if pre_release_version and pre_release_version:
+ if pre_release_version and pre_release_version_type:
final_version += pre_release_version_type + pre_release_version
# Add the current timestamp to the version number, to suggest it