Prevent loading containers from "old" folders #258
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Devs, see CURA-3923. |
awhiemstra
suggested changes
Jun 12, 2017
UM/Settings/ContainerRegistry.py
Outdated
| @@ -141,6 +141,8 @@ def getEmptyInstanceContainer(self) -> InstanceContainer: | |||
| # that were already added when the first call to this method happened will not be re-added. | |||
| def load(self) -> None: | |||
| files = [] | |||
| old_file_expression = re.compile("\\" + os.sep + "old\\" + os.sep + "\d+\\" + os.sep) | |||
There was a problem hiding this comment.
I'd prefer to use re.compile(r"\{sep}old\{sep}\d+\{sep}".format(sep = os.sep) here since this makes it less of a string puzzle. Additionally it avoids needing to escape the slashes due to using "raw string" mode.
There was a problem hiding this comment.
Agreed, much better.
fieldOfView
force-pushed
the
fix_prevent_loading_old_containers
branch
from
7e074c0 to
524d34d
Compare
|
fieldOfView
force-pushed
the
fix_prevent_loading_old_containers
branch
from
524d34d to
e85ab8f
Compare
|
Thanks for the quick fix, merged. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR prevents loading containers from "old/" folders. These files are backups from the version upgrade system.
This fixes Ultimaker/Cura#1902, Ultimaker/Cura#1855, Ultimaker/Cura#1874 and many others in the forum
See Ultimaker/Cura#1902 (comment)