From 2c79efd8bd9b7c04bb57b924f05ec6e3d3944817 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 14 Dec 2016 13:01:32 +0100 Subject: [PATCH 1/3] Fix [containers] items must be strings --- plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py b/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py index 04267f45f1..a28a9f9208 100644 --- a/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py +++ b/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py @@ -62,7 +62,7 @@ class VersionUpgrade22to24(VersionUpgrade): config.remove_option("general", "containers") for index in range(len(container_list)): - config.set("containers", index, container_list[index]) + config.set("containers", str(index), container_list[index]) output = io.StringIO() config.write(output) From dcae7575e4b8608c80d0df652f1458d2ce35eb56 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 14 Dec 2016 13:07:12 +0100 Subject: [PATCH 2/3] Fix extraneous empty ("") container being added --- plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py b/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py index a28a9f9208..04700853dd 100644 --- a/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py +++ b/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py @@ -48,6 +48,8 @@ class VersionUpgrade22to24(VersionUpgrade): # Change the name of variant and insert empty_variant into the stack. new_container_list = [] for item in container_list: + if not item: # the last item may be an empty string + continue if item == variant_name: new_container_list.append(config_name) new_container_list.append("empty_variant") From 92505206282ad25b25d4c9f45edb3fe70d5b6e27 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 14 Dec 2016 13:08:18 +0100 Subject: [PATCH 3/3] Fix variant before definition_changes --- plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py b/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py index 04700853dd..b820306fe1 100644 --- a/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py +++ b/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py @@ -51,8 +51,8 @@ class VersionUpgrade22to24(VersionUpgrade): if not item: # the last item may be an empty string continue if item == variant_name: - new_container_list.append(config_name) new_container_list.append("empty_variant") + new_container_list.append(config_name) else: new_container_list.append(item)