A couple fixes for Antergos Linux #36428
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
It appears that Antergos distributes a modified version of pacman which adds additional lines while updating its package databases. These are incorrectly interpreted as available upgrades. This commit checks for these lines in the output and skips them.
This is a more future-proof method, it'll keep us from continuing to update pacman.py each time we add another Arch derivative to the Arch os_family.
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 pull request fixes the following issues affecting Antergos Linux:
/etc/lsb-release, settingDISTRIB_ID=Arch. While this doesn't break things like setting pacman.py as thepkgvirtual module, it does result in theosgrain being set toArchwhen it should be set asAntergos.pkg.list_upgrades(see pkg.list_upgrades return debug information rather than packages list #36388).Additionally, pacman.py, despite only being assigned to distros in the
Archos_family, has its__virtual__function checking theosgrain. This pull request changes this so that it checks that theos_familyisArch, which should be easier to maintain moving forward.Fixes #36388.