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.

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

os/linux.rb: don't show codename when it's n/a #9353

Merged
merged 2 commits into from Dec 2, 2020

Conversation

maxim-belkin
Copy link
Member

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same change?
  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your changes? Here's an example.
  • Have you successfully run brew style with your changes locally?
  • Have you successfully run brew tests with your changes locally?
  • Have you successfully run brew man locally and committed any changes?

Some Linux distros don't have codenames, so lsb_release -c returns n/a. brew config shows the OS that Homebrew detects and adds OS codename in parentheses. It can be somewhat confusing when codename is equal to n/a:

OS: SUSE Linux Enterprise Server 11 (x86_64) (n/a)

Here I'm changing the output of os_version function so that we don't show codename when it's n/a. Also, instead of using outputs of lsb_release -d and lsb_release -c separately, I'm calling lsb_release with -a flag to get all the information in one step and then parse the output to obtain the required information.

@BrewTestBot
Copy link
Member

Review period will end on 2020-12-01 at 20:51:04 UTC.

@BrewTestBot BrewTestBot added the waiting for feedback Merging is blocked until sufficient time has passed for review label Nov 30, 2020
Copy link
Member

@MikeMcQuaid MikeMcQuaid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine with me but will need rebased before CI is 🟢

@maxim-belkin
Copy link
Member Author

rebased

@BrewTestBot BrewTestBot removed the waiting for feedback Merging is blocked until sufficient time has passed for review label Dec 1, 2020
@BrewTestBot
Copy link
Member

Review period ended.

@MikeMcQuaid MikeMcQuaid merged commit 68889b9 into Homebrew:master Dec 2, 2020
@MikeMcQuaid
Copy link
Member

Thanks @maxim-belkin!

@maxim-belkin maxim-belkin deleted the config-no-codename branch December 2, 2020 12:54
@sjackman
Copy link
Member

sjackman commented Dec 3, 2020

Thanks, Maxim!

@BrewTestBot BrewTestBot added the outdated PR was locked due to age label Jan 2, 2021
@Homebrew Homebrew locked as resolved and limited conversation to collaborators Jan 2, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
outdated PR was locked due to age
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants