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

Ignore conflicts between versions of same mod #2430

Merged
merged 1 commit into from Apr 27, 2018

Conversation

@HebaruSan
Copy link
Member

commented Apr 27, 2018

Problem

If a mod conflicts with itself, it can no longer be upgraded as of #2339; see #2428 for details of a specific example involving Scatterer.

Cause

When we upgrade, we ask the SanityChecker to look for missing dependencies and conflicts in a scenario in which the new versions are installed without removing the old versions. Since the old and new modules are both there, we check whether they conflict with one another, and a self-conflict is treated as a real conflict.

Prior to #2339, this was avoided by ignoring conflicts if the identifiers were the same, but when we made conflicts version-specific, we only ignored that conflict if the identifier and version are the same.

Changes

Now SanityChecker will ignore any conflict between two mods with the same identifier, as it did historically. Other conflicts will still care about versions, so #2339 is not voided.

A test is added to catch regressions.

Fixes #2428.

@HebaruSan HebaruSan force-pushed the HebaruSan:fix/self-conflict-upgrade branch from 50a8056 to 9472385 Apr 27, 2018
@politas politas merged commit 9472385 into KSP-CKAN:master Apr 27, 2018
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
politas added a commit that referenced this pull request Apr 27, 2018
@HebaruSan HebaruSan deleted the HebaruSan:fix/self-conflict-upgrade branch Apr 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.