From 4b18539c6e02753a1df3453d7cb082bc4608526c Mon Sep 17 00:00:00 2001
From: Dalibor Pospisil <dapospis@redhat.com>
Date: Fri, 20 Jun 2014 16:38:35 +0200
Subject: [PATCH 11/14] log rpm package also in non asserted rpm checks
---
src/rpms.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/rpms.sh b/src/rpms.sh
index 577b790..c9edd0c 100644
--- a/src/rpms.sh
+++ b/src/rpms.sh
@@ -62,6 +62,9 @@ __INTERNAL_RpmPresent() {
[ "$release" == "" ] && package=$name-$version
[ "$version" == "" ] && package=$name
+ export __INTERNAL_RPM_ASSERTED_PACKAGES="$__INTERNAL_RPM_ASSERTED_PACKAGES $name"
+ rljRpmLog "$name"
+
if [ -n "$package" ]; then
rpm -q $package
local status=$?
@@ -199,8 +202,6 @@ rlAssertRpm() {
rlAssertRpm $package
done
else
- export __INTERNAL_RPM_ASSERTED_PACKAGES="$__INTERNAL_RPM_ASSERTED_PACKAGES $1"
- rljRpmLog "$1"
__INTERNAL_RpmPresent assert $1 $2 $3 $4
fi
}
--
1.9.3