os-autoinst-obs-auto-submit: Do not fail on expected diff output #372
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
Martchus
approved these changes
Feb 3, 2025
okurz
requested changes
Feb 3, 2025
os-autoinst-obs-auto-submit
Outdated
| @@ -129,7 +129,7 @@ generate_os-autoinst-distri-opensuse-deps_changelog() { | |||
| echo "-------------------------------------------------------------------" | |||
| echo "$(LANG=c date -u) - Dominik Heidler <[email protected]>" | |||
| echo | |||
| diff -u "$package"-factory.spec "$dir"/"$package"/_service:obs_scm:"$package".spec \ | |||
| { diff -u "$package"-factory.spec "$dir"/"$package"/_service:obs_scm:"$package".spec || :; } \ | |||
There was a problem hiding this comment.
sigh can we extract that into a function to prevent the confusion about the duplicate code? Like
spec_has_changes_in_requires() {
local dir="$1"
local package="$2"
{ diff -u "$package"-factory.spec "$dir"/"$package"/_service:obs_scm:"$package".spec || :; } | grep "^[+-]Requires"
}
…
- { diff -u "$package"-factory.spec "$dir"/"$package"/_service:obs_scm:"$package".spec || :; } | grep "^[+-]Requires"
+ spec_has_changes_in_requires $dir $packageThere was a problem hiding this comment.
I didn't even notice it is indeed diffing the very same files. Yes that's a good candidate for refactor then. Will try to do that.
|
I added a new commit which extracts the common code into a new function. |
Martchus
approved these changes
Feb 3, 2025
okurz
approved these changes
Feb 3, 2025
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.
Reference: https://progress.opensuse.org/issues/176316