From: Frank Ch. Eigler <fche@redhat.com>
Date: Tue, 25 Feb 2020 19:27:33 +0000 (-0500)
Subject: debuginfod PR25583: map -R to -Z.rpm
X-Git-Tag: elfutils-0.179~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37d56e9275fcf70c4a0cb19c0f2ac1d4032acfab;p=thirdparty%2Felfutils.git

debuginfod PR25583: map -R to -Z.rpm

It was reported that libarchive (bsdtar) at least as far back as rhel7
(3.1.2) can natively process RPM files, so there's no need to mediate
those accesses through rpm2cpio.  There's no noteworthy performance or
testing impact.

Signed-off-by: Frank Ch. Eigler <fche@redhat.com>
Signed-off-by: Mark Wielaard <mark@klomp.org>
---

diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog
index 4bbe0d35b..16e143095 100644
--- a/debuginfod/ChangeLog
+++ b/debuginfod/ChangeLog
@@ -1,3 +1,7 @@
+2020-02-25  Frank Ch. Eigler  <fche@redhat.com>
+
+	* debuginfod.cxx (parse_opt): Treat -R as if -Z.rpm .
+
 2020-02-25  Frank Ch. Eigler  <fche@redhat.com>
 
 	* debuginfod.cxx (fdcache_prefetch): New parameter.
diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
index be3868bb1..7c7e85eb6 100644
--- a/debuginfod/debuginfod.cxx
+++ b/debuginfod/debuginfod.cxx
@@ -426,7 +426,7 @@ parse_opt (int key, char *arg,
       break;
     case 'F': scan_files = true; break;
     case 'R':
-      scan_archives[".rpm"]="rpm2cpio";
+      scan_archives[".rpm"]="cat"; // libarchive groks rpm natively
       break;
     case 'U':
       scan_archives[".deb"]="dpkg-deb --fsys-tarfile";
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 3e57491c8..764454121 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2020-02-25  Frank Ch. Eigler  <fche@redhat.com>
+
+	* debuginfod.8: Note that -R works just like -Z.rpm .
+
 2020-02-25  Frank Ch. Eigler  <fche@redhat.com>
 
 	* debuginfod.8: Document new --fdcache-prefetch option.
diff --git a/doc/debuginfod.8 b/doc/debuginfod.8
index ed9724d6f..32fca6c48 100644
--- a/doc/debuginfod.8
+++ b/doc/debuginfod.8
@@ -99,7 +99,8 @@ additional patterns.  This option may be repeated.
 .TP
 .B "\-R"
 Activate RPM patterns in archive scanning.  The default is off.
-Equivalent to \fB\%\-Z\~.rpm=rpm2cpio\fP.
+Equivalent to \fB\%\-Z\~.rpm=cat\fP, since libarchive can natively
+process RPM archives.
 
 .TP
 .B "\-U"