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

Improve OpenBSD -CURRENT detection and Dry-run feedback #954

Merged
merged 3 commits into from
Oct 18, 2024

Conversation

Izder456
Copy link
Contributor

@Izder456 Izder456 commented Oct 16, 2024

What does this PR do

This commit improves the -CURRENT detection by way of parsing /etc/motd. This change is more future-proof as when OpenBSD nears a stable release, uname will temporarily report like -STABLE.

This commit also adds feedback if -CURRENT is found to make debugging this feature easier with --dry-run, or, just a regular run as well.

Standards checklist

  • The PR title is descriptive.
  • I have read CONTRIBUTING.md
  • Optional: I have tested the code myself

src/steps/os/openbsd.rs Outdated Show resolved Hide resolved
src/steps/os/openbsd.rs Outdated Show resolved Hide resolved
src/steps/os/openbsd.rs Outdated Show resolved Hide resolved
This commit improves the -CURRENT detection by way of parsing `/etc/motd`. This change is more future-proof as when OpenBSD nears a stable release, `uname` will temporarily report like -STABLE.

This commit *also* adds feedback if -CURRENT is found to make debugging this feature easier with `--dry-run`, or, just a regular run as well.
@Izder456
Copy link
Contributor Author

@SteveLauC

Force pushed a fix to my fork. Thanks for the review.

This good?

src/steps/os/openbsd.rs Outdated Show resolved Hide resolved
src/steps/os/openbsd.rs Show resolved Hide resolved
src/steps/os/openbsd.rs Outdated Show resolved Hide resolved
This commit removes the command flag feedback. This commit also swaps the output "update", for "upgrade", making this step closer to other steps for consistency.
@Izder456
Copy link
Contributor Author

Izder456 commented Oct 17, 2024

@SteveLauC

Pushed a commit to make it less talky. I also swapped "update" for "upgrade" to mirror other steps' verbiage.

Ok?

Copy link
Member

@SteveLauC SteveLauC left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@SteveLauC SteveLauC merged commit 2c2569c into topgrade-rs:main Oct 18, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants