Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reverse order of migrations #9226

Merged
merged 6 commits into from
Nov 22, 2021
Merged

Reverse order of migrations #9226

merged 6 commits into from
Nov 22, 2021

Conversation

fmoc
Copy link
Contributor

@fmoc fmoc commented Nov 19, 2021

Should fix #9224. Tested with testpilotcloud theme.

Fabian Müller added 2 commits November 19, 2021 07:09
This way, we won't accidentally migrate an older configuration if a newer one is available.
src/gui/application.cpp Outdated Show resolved Hide resolved
}
}
}
} else {
// migration worked!
success = true;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both branches migrate, I guess we should break in both?

@sonarcloud
Copy link

sonarcloud bot commented Nov 22, 2021

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 2 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@fmoc fmoc merged commit 78796ed into 2.9 Nov 22, 2021
@delete-merged-branch delete-merged-branch bot deleted the work/improve-migrations branch November 22, 2021 14:17
TheOneRing pushed a commit that referenced this pull request Nov 22, 2021
* Reverse order of paths to migrate

This way, we won't accidentally migrate an older configuration if a newer one is available.

* Add log prefix for non-legacy migration code as well

* Also break if file-based migration works

* Add stripTrailingSlash to Utility

* Simplify code

* Make configLocationsToMigrate const

Co-authored-by: Hannah von Reth <hannah.vonreth@owncloud.com>
(cherry picked from commit 78796ed)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants