Skip to content

Commit

Permalink
Merge pull request #18 from DimStar77/baselibs.conf
Browse files Browse the repository at this point in the history
baselibs verification: targettype is a nown keyword - treat it as a '…
  • Loading branch information
lnussel committed May 13, 2015
2 parents 23830c1 + a6c79f7 commit ff268e1
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion 70-baselibs
Expand Up @@ -16,8 +16,13 @@ containsElement () {
# PASS if there is no baselibs.conf
[ -f $DIR_TO_CHECK/baselibs.conf ] || exit 0

# PASS if we have trouble parsing the .spec file
rpm -q --specfile $DIR_TO_CHECK/*.spec >/dev/null 2>&1 || exit 0

BUILTBINARIES=($(rpm -q --qf "%{name}\n" --specfile $DIR_TO_CHECK/*.spec))
BASELIBSREF=$(grep "^\\S\+" $DIR_TO_CHECK/baselibs.conf)
# add 'targettype' as a 'known keyword' to not trip over it
BUILTBINARIES+=('targettype')
BASELIBSREF=$(grep -o "^\\S\+" $DIR_TO_CHECK/baselibs.conf)

RETURN=0
for rpm in $BASELIBSREF; do
Expand Down

0 comments on commit ff268e1

Please sign in to comment.