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.

Sign up for GitHub

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

Jump to bottom

Handle upstream package indices containing packages with a wrong architecture #423

Merged
merged 1 commit into from
Jan 26, 2022
Merged

Handle upstream package indices containing packages with a wrong architecture #423

merged 1 commit into from
Jan 26, 2022

Conversation

quba42
Copy link
Collaborator

@quba42 quba42 commented Jan 5, 2022 •
edited
Loading

Closes #422

@quba42 quba42 added the .bugfix CHANGES/<issue_number>.bugfix label Jan 5, 2022
@evgeni
Copy link
Member

evgeni commented Jan 5, 2022

Will that reject arch:all packages from a arch:amd64 repo? Because I think that's a valid combination.

@quba42
Copy link
Collaborator Author

quba42 commented Jan 5, 2022 •
edited
Loading

@evgeni I think arch=all packages are already handled separately, but I need to double check!

Note to self: I also need to test if this fix interferes with flat repo syncs.

@quba42
Copy link
Collaborator Author

quba42 commented Jan 5, 2022

Ugh, I need to distinguish between at least the following top level of cases:

  • Flat repo format
  • "all" in release_file.architectures (separate binary-all/Packages index)
  • not "all" in release_file.architectures (no separate binary-all/Packages index)

@quba42 quba42 force-pushed the wrong_arch_package_paragraphs branch from 35e357c to aa55a5a Compare January 5, 2022 14:28
@quba42
Copy link
Collaborator Author

quba42 commented Jan 5, 2022 •
edited
Loading

And so this "straightforward fix" has turned into an incomprehensible mess...

I had some Idea for how to refactor the sync code to make it more readable, but I forgot what it was...

@quba42 quba42 force-pushed the wrong_arch_package_paragraphs branch from aa55a5a to 1a031aa Compare January 11, 2022 17:54
@quba42 quba42 force-pushed the wrong_arch_package_paragraphs branch from 1a031aa to 5159b90 Compare January 19, 2022 09:21
@quba42 quba42 force-pushed the wrong_arch_package_paragraphs branch from 5159b90 to 0416383 Compare January 26, 2022 12:21
@quba42
Copy link
Collaborator Author

quba42 commented Jan 26, 2022

All the warnings pulp_deb now finds for dists/bionic/main/binary-amd64/Packages index of the HashiCorp APT repo: hashi_corp_apt_repo_warnings.txt

@quba42
Copy link
Collaborator Author

quba42 commented Jan 26, 2022

After testing the new sync code on several different repos of different formats, and asking of second opinions, I will now merge this.

@quba42 quba42 merged commit cef99c5 into pulp:main Jan 26, 2022
@quba42 quba42 deleted the wrong_arch_package_paragraphs branch January 26, 2022 13:28
@patchback
Copy link

patchback bot commented Apr 20, 2022 •
edited
Loading

Backport to 2.17: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.17/cef99c5bae8d7945e33a69cf9632efcf5e590412/pr-423

Backported as #483

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Apr 20, 2022
@quba42 @patchback
Merge pull request #423 from ATIX-AG/wrong_arch_package_paragraphs
00d7158 
Handle upstream package indices containing packages with a wrong architecture

(cherry picked from commit cef99c5)
@patchback patchback bot mentioned this pull request Apr 20, 2022
Merged
quba42 added a commit that referenced this pull request Apr 21, 2022
@quba42
Merge pull request #423 from ATIX-AG/wrong_arch_package_paragraphs
56d4af9 
Handle upstream package indices containing packages with a wrong architecture

(cherry picked from commit cef99c5)
@patchback
Copy link

patchback bot commented Apr 21, 2022 •
edited
Loading

Backport to 2.16: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.16/cef99c5bae8d7945e33a69cf9632efcf5e590412/pr-423

Backported as #498

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Apr 21, 2022
@quba42 @patchback
Merge pull request #423 from ATIX-AG/wrong_arch_package_paragraphs
126d0a8 
Handle upstream package indices containing packages with a wrong architecture

(cherry picked from commit cef99c5)
@patchback patchback bot mentioned this pull request Apr 21, 2022
Merged
quba42 added a commit that referenced this pull request Apr 21, 2022
@quba42
Merge pull request #423 from ATIX-AG/wrong_arch_package_paragraphs
f092965 
Handle upstream package indices containing packages with a wrong architecture

(cherry picked from commit cef99c5)
quba42 added a commit that referenced this pull request Apr 21, 2022
@quba42
Merge pull request #423 from ATIX-AG/wrong_arch_package_paragraphs
00ae464 
Handle upstream package indices containing packages with a wrong architecture

(cherry picked from commit cef99c5)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
.bugfix CHANGES/<issue_number>.bugfix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Handle upstream package indices containing packages with the wrong architecture
2 participants
@quba42 @evgeni