From 79e3a0cf295baf315dd166cb891b04ab91c5153c Mon Sep 17 00:00:00 2001
From: Pavlina Moravcova Varekova <pmoravco@redhat.com>
Date: Apr 23 2020 14:26:58 +0000
Subject: Show list of files only once when use rpm -ql and multiple rpm files


---

diff --git a/lib/query.c b/lib/query.c
index f5851e4..26cdecf 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -582,7 +582,8 @@ int rpmcliArgIter(rpmts ts, QVA_t qva, ARGV_const_t argv)
 	    if (mi == NULL && qva->qva_source == RPMQV_PACKAGE) {
 		size_t l = strlen(*arg);
 		if (l > 4 && !strcmp(*arg + l - 4, ".rpm")) {
-		    rpmgi gi = rpmgiNew(ts, giFlags, argv);
+		    char * const argFirst[2] = { arg[0], NULL };
+		    rpmgi gi = rpmgiNew(ts, giFlags, argFirst);
 		    ecLocal = rpmgiShowMatches(qva, ts, gi);
 		    rpmgiFree(gi);
 		}
diff --git a/tests/rpmquery.at b/tests/rpmquery.at
index ab7bb3c..0dc6d78 100644
--- a/tests/rpmquery.at
+++ b/tests/rpmquery.at
@@ -62,6 +62,24 @@ hello.spec
 AT_CLEANUP
 
 # ------------------------------
+AT_SETUP([rpm -ql multiple *.rpm])
+AT_KEYWORDS([query])
+AT_CHECK([
+runroot rpm \
+  -ql \
+  /data/SRPMS/hello-1.0-1.src.rpm /data/RPMS/hello-1.0-1.i386.rpm
+],
+[0],
+[hello-1.0.tar.gz
+hello.spec
+/usr/local/bin/hello
+/usr/share/doc/hello-1.0
+/usr/share/doc/hello-1.0/FAQ
+],
+[ignore])
+AT_CLEANUP
+
+# ------------------------------
 AT_SETUP([rpmspec -q])
 AT_KEYWORDS([query])
 AT_CHECK([