Honors `/usr/lib/os-release` when `/etc/os-release` is not available by HorlogeSkynet · Pull Request #262 · python-distro/distro

HorlogeSkynet · 2020-04-21T14:38:38Z

Hey over here 👋

So, there is ~~a bug~~ an unexpected behavior with distro in very "lite" environments, when for example even /etc/os-release is not available.

One-liner to reproduce : docker run archlinux:latest /bin/bash -c 'pacman --noconfirm -Sy python-distro && python3 -m distro'

It actually appears that we should be dealing with /usr/lib/os-release in such cases (reference).

This patch implements the expected behavior, and adds a very specific test case to verify it.

Bye 🙇

HorlogeSkynet · 2020-04-26T14:06:17Z

Note : the patch seems back-portable to the python2.6-support branch.

UPDATE 2020-06-02 : Not anymore, since it relies on #247 (not back-ported) too now.

See <https://www.freedesktop.org/software/systemd/man/os-release.html#Description>.

HorlogeSkynet · 2020-06-02T13:28:05Z

Rebased against new master, fixing conflicts to include changes brought by #247.

(cc @nir0s)

HorlogeSkynet · 2020-07-23T10:06:44Z

Up @nir0s please 🙄

HorlogeSkynet · 2020-09-27T08:58:44Z

Up... again @nir0s (cc @hartwork maybe ?) 😕

HorlogeSkynet · 2020-12-31T15:45:59Z

One more "up" for 2020.

hartwork · 2020-12-31T16:03:11Z

Up... again @nir0s (cc @hartwork maybe ?) confused

I don't have capacity for proper review here atm, I'll leave this to @nir0s for now.
I left a thumbs up on the general idea on top though, from a quick look it looks like a good move.

nir0s · 2020-12-31T16:19:32Z

Fellas, I truly apologize, but I indeed hardly have any capacity to deal with issues nowadays.

I'd appreciate adding collaborators. Any volunteers?

HorlogeSkynet · 2020-12-31T16:26:18Z

Well, thanks for your answer @nir0s. I can't go full-time on it of course, but as I now maintain a project depending completely on yours, I'm indirectly interesting in distro's "health condition".
So I'm okay for sharing work with other(s), if it's really needed.

Bye, take care.

hartwork · 2020-12-31T16:59:20Z

Fellas, I truly apologize, but I indeed hardly have any capacity to deal with issues nowadays.

I think it's good and fair to be realistic and open about it, thanks for that. And thanks for your work on distro in general 🙏 At the same time I think it's a bit sad also e.g. because of the 9000+ projects dependening on distro today (on GitHub alone) including important players like SaltStack, Let's Encrypt Certbot, docker-compose and package manager conan. So the 154 stars up here are only the tip of the iceberg.

If I may ask, are your capacity constraints temporary or expected long-term? If long-term, maybe it makes sense to turn this project into a new GitHub org then. It's rather easy to do technically — create the org, then do a repo transfer (which moves all issues and PRs just like that, then add people) — and it may communicate better that the project has become the effort of a new team if you're saying goodbye long-term. At least one other trusted person will also need PyPI access for a full transition. I hope I'm being respectful here, I didn't intend otherwise. What do you think?

I'd appreciate adding collaborators. Any volunteers?

Speaking for myself, I will not be able to shoulder much load here but if there are other active contributors, I may be able to join and help a bit myself too (after my current sprint on https://github.com/git-big-picture/git-big-picture has cooled down more).

hartwork

I had a closer look now. Given what the spec says about /usr/lib/os-release I think merging some version of this pull request will be important to do justice to the specification. So thanks to @HorlogeSkynet for working on this matter! 🙏
Below are my findings. Some of them are picky… but with good intentions. I'm happy to learn I misunderstood or overlooked something. Best, Sebastian

Co-authored-by: Sebastian Pipping <sebastian@pipping.org>

hartwork

@HorlogeSkynet looks good to me now, thanks for your contribution and your patience! 🙏

[skip ci]

HorlogeSkynet · 2021-01-10T13:27:15Z

@HorlogeSkynet looks good to me now, thanks for your contribution and your patience! 🙏

You're very welcome, sorry for this little leftover that didn't catch my attention sooner.
Bye 🙇

hartwork · 2021-01-16T17:43:54Z

@nir0s this PR is ready and waiting for your approval by now. Do you have a minute?

hartwork · 2021-01-25T14:48:11Z

@nir0s any news?

hartwork · 2021-03-06T18:33:41Z

@nir0s how can we move forward?

HorlogeSkynet · 2021-05-15T14:01:26Z

So sad only pull requests "brandishing" the fork totem are able to get things move forward... 🙁

hartwork · 2021-05-15T14:26:52Z

@nir0s this PR is ready and waiting for your approval by now. Do you have a minute?

@nir0s please please

sethmlarson

Overall this looks like a good improvement. Had some comments for you:

sethmlarson

Going to approve since the reference comment is optional.

nir0s · 2021-07-01T18:08:02Z

There are conflicts now, though. @HorlogeSkynet.

HorlogeSkynet · 2021-07-01T18:09:29Z

There are conflicts now, though. @HorlogeSkynet.

🙄 I'll try to rebase soon.

hartwork · 2021-07-01T18:12:05Z

🙄 I'll try to rebase soon.

@HorlogeSkynet let me know if you need help

HorlogeSkynet · 2021-07-01T18:40:28Z

@nir0s I went for a manual merge, all good now ✅

Samuel FORESTIER added 2 commits June 2, 2020 15:22

Honors /usr/lib/os-release when /etc/os-release is not available
c7e88ba
See <https://www.freedesktop.org/software/systemd/man/os-release.html#Description>.

Updates documentation according to the new (but expected) behavior
90ceac8

hartwork reviewed Jan 5, 2021
View reviewed changes

Comment threadREADME.md Outdated
Comment threaddistro.py Outdated
Comment threaddistro.py Outdated
Comment threaddistro.py
Comment threaddistro.py Outdated
Comment threaddocs/index.rst
Comment threadtests/test_distro.py Outdated
Comment threadtests/test_distro.py

Samuel FORESTIERand others added 6 commits January 5, 2021 19:02

Partially revertsc7e88babased on@hartworkcomments
714adc0

RenamesUNIXLIBSDIRaccording to@hartworkthoughts
a1d8835

Follow-up to90ceac8according to@hartworkfindings
e16f0f7

Prefers a fully API backward-compatible implementation for c7e88baa
291fd34
Co-authored-by: Sebastian Pipping <sebastian@pipping.org>

Re-adds an empty new-line that somehow got lost in distro.py
d2f10c4

Don't touch those lines to keep the final patch clean
d8543e1

hartwork reviewed Jan 10, 2021
View reviewed changes

Comment threaddistro.py Outdated

hartwork previously approved these changes Jan 10, 2021
View reviewed changes

Removes a leftover empty new-line wrongly kept across previous commits
702677d
[skip ci]

Merge branch 'master' into master
43b8baa

HorlogeSkynet mentioned this pull request Jun 2, 2021
[META] Is this project still properly maintained ? #274
Closed

sethmlarson suggested changes Jul 1, 2021
View reviewed changes

Comment threadtests/resources/testdistros/distro/usrlibosreleaseonly/usr/lib/os-release
Comment threadREADME.md
Comment threaddistro.py Outdated

sethmlarson previously approved these changes Jul 1, 2021
View reviewed changes

Merge branch 'master' into master
1f61af4

HorlogeSkynet dismissed stale reviews from sethmlarson and hartwork via 1f61af4July 1, 2021 18:32

Fixes BLACK linting
4b6a363

hartwork approved these changes Jul 1, 2021
View reviewed changes

nir0s approved these changes Jul 2, 2021
View reviewed changes

nir0s merged commit b5a1a1e into python-distro:masterJul 2, 2021

hartwork added this to the 1.6.0 milestone Jul 10, 2021

HorlogeSkynet mentioned this pull request Feb 12, 2022
Restores compatibility shim with platform.linux_distribution#325
Merged

This was referenced Nov 10, 2025
Add support for CloudLinux VM missing os-release and /etc/redhat-release #369
Closed
CloudLinux VM not recognized #240
Closed

HorlogeSkynet mentioned this pull request Jun 29, 2026
Manually resolve path relatively to root_dir to prevent escape #328
Open

Uh oh!

Conversation

HorlogeSkynet commented Apr 21, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

HorlogeSkynet commented Apr 26, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

HorlogeSkynet commented Jun 2, 2020

Uh oh!

HorlogeSkynet commented Jul 23, 2020

Uh oh!

HorlogeSkynet commented Sep 27, 2020

Uh oh!

HorlogeSkynet commented Dec 31, 2020

Uh oh!

hartwork commented Dec 31, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nir0s commented Dec 31, 2020

Uh oh!

HorlogeSkynet commented Dec 31, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hartwork commented Dec 31, 2020

Uh oh!

hartwork left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hartwork left a comment

Choose a reason for hiding this comment

Uh oh!

HorlogeSkynet commented Jan 10, 2021

Uh oh!

hartwork commented Jan 16, 2021• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hartwork commented Jan 25, 2021

Uh oh!

hartwork commented Mar 6, 2021

Uh oh!

HorlogeSkynet commented May 15, 2021

Uh oh!

hartwork commented May 15, 2021

Uh oh!

sethmlarson left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sethmlarson left a comment

Choose a reason for hiding this comment

Uh oh!

nir0s commented Jul 1, 2021

Uh oh!

HorlogeSkynet commented Jul 1, 2021

Uh oh!

hartwork commented Jul 1, 2021• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

HorlogeSkynet commented Jul 1, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

HorlogeSkynet commented Apr 21, 2020•
edited
Loading

HorlogeSkynet commented Apr 26, 2020•
edited
Loading

hartwork commented Dec 31, 2020•
edited
Loading

HorlogeSkynet commented Dec 31, 2020•
edited
Loading

hartwork commented Jan 16, 2021•
edited
Loading

hartwork commented Jul 1, 2021•
edited
Loading