Skip to content

Restores compatibility shim with platform.linux_distribution - #325

Merged
HorlogeSkynet merged 2 commits into
masterfrom
fix/linux_distribution_id_regression
Feb 13, 2022
Merged

Restores compatibility shim with platform.linux_distribution#325
HorlogeSkynet merged 2 commits into
masterfrom
fix/linux_distribution_id_regression

Conversation

@HorlogeSkynet

@HorlogeSkynetHorlogeSkynet commented Feb 12, 2022•
edited
Loading

Copy link
Copy Markdown
Member

#230 introduced proper support for os-release VERSION_CODENAME attribute but broke compatibility shim with (now defunct) platform.linux_distribution as the third tuple member (codename) were not taken from VERSION os-release attribute anymore.

Closes#238.

EDIT : Sorry for first submission, wrong revision.

@HorlogeSkynetHorlogeSkynet added this to the 1.7.0 milestone Feb 12, 2022
@HorlogeSkynet
HorlogeSkynet requested a review from a teamFebruary 12, 2022 12:52
@HorlogeSkynetHorlogeSkynet self-assigned this Feb 12, 2022
@HorlogeSkynet
HorlogeSkynetforce-pushed the fix/linux_distribution_id_regression branch from c39caf0 to 2871ef3CompareFebruary 12, 2022 13:35
hartwork
hartwork reviewed Feb 12, 2022
View reviewed changes
Comment threadsrc/distro/distro.py Outdated
Comment threadsrc/distro/distro.py Outdated
Comment threadtests/test_distro.py
@sethmlarson

sethmlarson commented Feb 12, 2022

Copy link
Copy Markdown
Contributor

Are we able to revert #230 first to ensure we're restoring compatibility and then evaluate what to do next?

@hartwork

hartwork commented Feb 12, 2022

Copy link
Copy Markdown
Contributor

Are we able to revert #230 first to ensure we're restoring compatibility and then evaluate what to do next?

@sethmlarson it's pretty big and in for 2 years. I'm not sure I'd vote for that path. What's the idea?

@HorlogeSkynet

HorlogeSkynet commented Feb 12, 2022

Copy link
Copy Markdown
MemberAuthor

Are we able to revert #230 first to ensure we're restoring compatibility and then evaluate what to do next?

I'm with @hartwork on this, #230 brings an important support and reverting it would change current distro behavior.

@HorlogeSkynet
HorlogeSkynetforce-pushed the fix/linux_distribution_id_regression branch from 2871ef3 to 68c163cCompareFebruary 13, 2022 10:52
hartwork
hartwork reviewed Feb 13, 2022
View reviewed changes
Comment threadsrc/distro/distro.py
Comment threadsrc/distro/distro.py
Samuel FORESTIER added 2 commits February 13, 2022 17:58
Samuel FORESTIER
Restores compatibility shim with platform.linux_distribution
84b7afd
distro#230 introduced proper support for os-release `VERSION_CODENAME`
attribute but broke compatibility shim with (now defunct)
`platform.linux_distribution` as the third tuple member (codename) were
not taken from `VERSION` os-release attribute anymore.
Closes#238.
Samuel FORESTIER
Removes unnecessary else..pass statement in os-release parsing
fa43a62
@HorlogeSkynet
HorlogeSkynetforce-pushed the fix/linux_distribution_id_regression branch from 68c163c to fa43a62CompareFebruary 13, 2022 16:59
@HorlogeSkynet
HorlogeSkynet merged commit 91aa0df into masterFeb 13, 2022
@HorlogeSkynet
HorlogeSkynet deleted the fix/linux_distribution_id_regression branch February 13, 2022 17:56
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hartworkhartworkhartwork approved these changes

Assignees

@HorlogeSkynetHorlogeSkynet

Labels

area: codebug

Projects

None yet

Milestone

1.7.0

Development

Successfully merging this pull request may close these issues.

Distro 1.40: possible regression in distro.codename()

3 participants

@HorlogeSkynet@sethmlarson@hartwork