From f8d773250a24adeb56ae2732bbd716bd3279c6f0 Mon Sep 17 00:00:00 2001 From: Anthony C George Date: Wed, 14 Jun 2017 12:52:07 -0400 Subject: [PATCH 1/2] cp_lib/split_version.py split_version_string expects to return major,minor,patch, but tools/make_load_settings.py only expects it to return major,minor, resulting in "ValueError: too many values to unpack (expected 2)" when attempting to have the version auto-incremented on build --- tools/make_load_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_load_settings.py b/tools/make_load_settings.py index 1721d9aa..8ced922c 100644 --- a/tools/make_load_settings.py +++ b/tools/make_load_settings.py @@ -248,7 +248,7 @@ def _do_my_tweak(old_line): offset = old_line.find("=") assert offset >= 0 value = old_line[offset + 1:].strip() - major, minor = split_version_string(value) + major, minor, patch = split_version_string(value) minor += 1 version = "%d.%d" % (major, minor) logging.debug( From d42112c2fb3ccbb350f0bbf18557ae3923405a2b Mon Sep 17 00:00:00 2001 From: Anthony C George Date: Wed, 14 Jun 2017 13:01:20 -0400 Subject: [PATCH 2/2] cp_lib/split_version.py split_version_string expects to return major,minor,patch, but tools/make_load_settings.py only expects it to return major,minor, resulting in "ValueError: too many values to unpack (expected 2)" when attempting to have the version auto-incremented on build - added patch to generated version --- tools/make_load_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_load_settings.py b/tools/make_load_settings.py index 8ced922c..756698e0 100644 --- a/tools/make_load_settings.py +++ b/tools/make_load_settings.py @@ -250,7 +250,7 @@ def _do_my_tweak(old_line): value = old_line[offset + 1:].strip() major, minor, patch = split_version_string(value) minor += 1 - version = "%d.%d" % (major, minor) + version = "%d.%d.%d" % (major, minor, patch) logging.debug( "Fix Version - increment from {} to {}".format(value, version))