Revert "Also upgrade profiles if only the setting version is incorrect"

This reverts commit 77d396b9bd.

The upgrade only needs to be run if it still uses "profile" as type (eg 2.1 profiles). So for a
regular setting version upgrade, this does not need to be run (and breaks importing profiles).

Fixes CURA-6592
This commit is contained in:
Jaime van Kessel 2019-06-24 11:59:13 +02:00
parent 0a0b4821ef
commit 9e4f2a441b

View file

@ -8,7 +8,6 @@ from UM.PluginRegistry import PluginRegistry
from UM.Logger import Logger
from UM.Settings.ContainerFormatError import ContainerFormatError
from UM.Settings.InstanceContainer import InstanceContainer # The new profile to make.
from cura.CuraApplication import CuraApplication #To get the current setting version.
from cura.ReaderWriters.ProfileReader import ProfileReader
import zipfile
@ -68,7 +67,7 @@ class CuraProfileReader(ProfileReader):
return []
version = int(parser["general"]["version"])
if InstanceContainer.Version != version or "metadata" not in parser or "setting_version" not in parser["metadata"] or parser["metadata"]["setting_version"] != str(CuraApplication.SettingVersion):
if InstanceContainer.Version != version:
name = parser["general"]["name"]
return self._upgradeProfileVersion(serialized, name, version)
else: