Skip to content

Commit

Permalink
Do not ignore conditionals of the form "%if ... %{name} ..."
Browse files Browse the repository at this point in the history
Pass --keep-name-conditionals option to the helpers/spec_query script
in order to take conditionals of the form "%if ... %{name} ..." into
account.
This is a fix for commit 0cb8321 ("Don't use rpmbuild to extract
sources, patches etc. from a spec").

Fixes: #55 ("source validator fails on openSUSE:Factory/coreutils")
  • Loading branch information
marcus-h committed Nov 15, 2017
1 parent e1a20d2 commit 4895529
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion 20-files-present-and-referenced
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ esac
for i in $DIR_TO_CHECK/*.spec ; do
test -f "$i" || continue
$HELPERS_DIR/spec_query --specfile "$i" --print-sources \
--no-conditionals --disambiguate-sources \
--no-conditionals --keep-name-conditionals --disambiguate-sources \
>> "$TMPDIR/sources" 2>"$TMPDIR/sources.err"
# ignore expand errors with macro scripts
sed -i "/can't expand %(...)/d" "$TMPDIR/sources.err"
Expand Down

0 comments on commit 4895529

Please sign in to comment.