Skip to content

Commit f01f79d

Browse files
Martin Kyralsopos
Martin Kyral
authored andcommitted
sort | uniq on BINARY_RPM in rlAssertBinaryOrigin (BZ#971347)
and code simplification..
1 parent 0474dc9 commit f01f79d

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/rpms.sh

+3-5
Original file line numberDiff line numberDiff line change
@@ -336,14 +336,12 @@ rlAssertBinaryOrigin() {
336336
local BINARY=$(readlink -f $FULL_CMD)
337337

338338
# get the rpm owning the binary
339-
local BINARY_RPM=$(rpm -qf $BINARY)
339+
local BINARY_RPM=$(rpm -qf --qf="%{name}\n" $BINARY)
340340

341341
rlLogDebug "Binary rpm: $BINARY_RPM"
342342

343-
local rpm
344-
for rpm in $PKGS ; do
345-
local TESTED_RPM=$(rpm -q $rpm | sort | uniq) &>/dev/null && \
346-
rlLogDebug "Testing rpm: $TESTED_RPM"
343+
local TESTED_RPM
344+
for TESTED_RPM in $PKGS ; do
347345
if [ "$TESTED_RPM" = "$BINARY_RPM" ] ; then
348346
status=0
349347
echo $BINARY_RPM

0 commit comments

Comments
 (0)