[FIXES #922] properly check for -CURRENT in OpenBSD steps and pass the correct flags to the respective commands #923
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
…he correct flags
|
Sorry, rustfmt is borked on my OpenBSD install, had to force |
SteveLauC
reviewed
Oct 6, 2024
src/steps/os/openbsd.rs
Outdated
| .status_checked() | ||
|
|
||
| let mut args = vec!["/usr/sbin/sysupgrade", "-n"]; | ||
| if is_openbsd_current() { |
There was a problem hiding this comment.
This function uses std::process::Command and Topgrade's dry-run option does not work with it, and thus this PR breaks the dry-run option.
We should use ctx.run_type().execute() instead, though I kinda think it won't work either. 😮💨
I guess we should skip all the update procedures and print something like "will update the system package" if this is a dry run(ctx has a dry_run() function to check if the current run is a dry-run or not)
| .status_checked()?; | ||
| let mut args = vec!["/usr/sbin/pkg_add", "-u"]; | ||
| if is_openbsd_current() { | ||
| args.push("-Dsnap"); |
|
BTW, CI fixed in the main branch, you can rebase your branch:) |
|
@SteveLauC This good? Just found out |
SteveLauC
approved these changes
Oct 14, 2024
6 tasks
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.
What does this PR do
See issue #922
Standards checklist
CONTRIBUTING.md