Fixes #28291 - Error in sync status after upgrade #8439
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
|
Issues: #28291 |
jlsherrill
reviewed
Nov 19, 2019
| @@ -66,7 +66,8 @@ def run_progress_weight | |||
| end | |||
|
|
|||
| def presenter | |||
| repo = ::Katello::Repository.find(input['repo_id']) | |||
| repo = ::Katello::Repository.find(input['repo_id']) if input['repo_id'] | |||
| repo = ::Katello::Repository.where(:pulp_id => input['pulp_id']).first if (!repo && input['pulp_id']) | |||
There was a problem hiding this comment.
nitpic: you could use repo ||= and avoid the !repo check
I would also probably add a comment to explain that older sync tasks could use the pulp_id (otherwise it might get removed in the future. Otherwise, looks good!
jlsherrill
approved these changes
Nov 19, 2019
jturel
pushed a commit
to jturel/katello
that referenced
this pull request
Nov 20, 2019
(cherry picked from commit 9c90664)
jturel
pushed a commit
that referenced
this pull request
Nov 25, 2019
(cherry picked from commit 9c90664)
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 action was changed in 3.14 and so was the presenter. For new syncs, the task has the input as repo_id. However, prior to 3.14, the task has input of pulp_id. Therefore, the presenter for old actions needs to look at pulp_id since repo_id wasn't available before that.
To reproduce: