Merge pull request #3883 from Ultimaker/3.4-fix-upgrade

CURA-5440 fix 3.4 upgrade
This commit is contained in:
alekseisasin 2018-06-04 17:14:41 +02:00 committed by GitHub
commit fc116e1206
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -107,7 +107,12 @@ class MachineInstance:
user_profile["values"] = {}
version_upgrade_manager = UM.VersionUpgradeManager.VersionUpgradeManager.getInstance()
user_storage = os.path.join(Resources.getDataStoragePath(), next(iter(version_upgrade_manager.getStoragePaths("user"))))
user_version_to_paths_dict = version_upgrade_manager.getStoragePaths("user")
paths_set = set()
for paths in user_version_to_paths_dict.values():
paths_set |= paths
user_storage = os.path.join(Resources.getDataStoragePath(), next(iter(paths_set)))
user_profile_file = os.path.join(user_storage, urllib.parse.quote_plus(self._name) + "_current_settings.inst.cfg")
if not os.path.exists(user_storage):
os.makedirs(user_storage)
@ -135,4 +140,4 @@ class MachineInstance:
output = io.StringIO()
config.write(output)
return [self._filename], [output.getvalue()]
return [self._filename], [output.getvalue()]