From cf21e7c74b2e68e9b37925df40b3b64bb7e96a0b Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Fri, 9 Mar 2018 16:21:42 +0100
Subject: [PATCH] Also upgrade definition_changes and user

Because these files share their version numbers with quality changes.

Contributes to issue CURA-5054.
---
 .../VersionUpgrade32to33/VersionUpgrade32to33.py    | 13 +++++++++++++
 .../VersionUpgrade/VersionUpgrade32to33/__init__.py | 12 +++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py b/plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py
index df22d6bf32..de2240a7c6 100644
--- a/plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py
+++ b/plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py
@@ -74,6 +74,19 @@ class VersionUpgrade32to33(VersionUpgrade):
         setting_version = int(parser.get("metadata", "setting_version", fallback = 0))
         return format_version * 1000000 + setting_version
 
+    ##  Upgrades non-quality-changes instance containers to have the new version
+    #   number.
+    def upgradeInstanceContainer(self, serialized, filename):
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+
+        #Update version number.
+        parser["general"]["version"] = "3"
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]
+
     ##  Upgrades a quality changes container to the new format.
     def upgradeQualityChanges(self, serialized, filename):
         parser = configparser.ConfigParser(interpolation = None)
diff --git a/plugins/VersionUpgrade/VersionUpgrade32to33/__init__.py b/plugins/VersionUpgrade/VersionUpgrade32to33/__init__.py
index 146ebbe95b..acccfd88dd 100644
--- a/plugins/VersionUpgrade/VersionUpgrade32to33/__init__.py
+++ b/plugins/VersionUpgrade/VersionUpgrade32to33/__init__.py
@@ -9,12 +9,22 @@ def getMetaData():
     return {
         "version_upgrade": {
             # From                        To                   Upgrade function
-            ("quality_changes", 2000004): ("quality_changes", 3000004, upgrade.upgradeQualityChanges),
+            ("definition_changes", 2000004): ("definition_changes", 3000004, upgrade.upgradeInstanceContainer),
+            ("quality_changes", 2000004):    ("quality_changes", 3000004, upgrade.upgradeQualityChanges),
+            ("user", 2000004):               ("user", 3000004, upgrade.upgradeInstanceContainer)
         },
         "sources": {
+            "definition_changes": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./definition_changes"}
+            },
             "quality_changes": {
                 "get_version": upgrade.getCfgVersion,
                 "location": {"./quality"}
+            },
+            "user": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./user"}
             }
         }
     }