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 4bbe0d35b5a49fc69eb0a29f39ed81aea4bd88cc..16e1430952e2c1569cd22a1295d6f73cc595e4b5 100644 (file)
--- 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 be3868bb1e42d1c776331be7aad5b197b80ce707..7c7e85eb6d14e137785e72a140fcfe581b60e18b 100644 (file)
--- 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 3e57491c8ca645cb2f0fad584ec5101b55c5adf0..764454121a6a40302267f64a9f8aaa072e4dd6c4 100644 (file)
--- 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 ed9724d6f1cf7a63474b019d1bc2280d2d040910..32fca6c48cfa5b7f79b893d2c8af1ad91bd6187f 100644 (file)
--- 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"