From 426a000dc59bd824de86d20b1e4d772340031067 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Thu, 26 Mar 2020 21:32:40 -0400 Subject: [PATCH] PR25583: debuginfod: conditionally prefer bsdtar to dpkg for .deb handling Prefer /usr/bin/dpkg-deb if installed, as normal on a debian system. Suggested-by: Mark Wielaard Signed-off-by: Frank Ch. Eigler --- debuginfod/ChangeLog | 5 +++++ debuginfod/debuginfod.cxx | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog index 5e19db5..58ba85c 100644 --- a/debuginfod/ChangeLog +++ b/debuginfod/ChangeLog @@ -1,3 +1,8 @@ +2020-03-26 Frank Ch. Eigler + + * debuginfod.cxx (parse_opt): For -U, prefer dpkg-deb + after all if access(3)-able, fallback to bsdtar. + 2020-03-25 Frank Ch. Eigler * debuginfod.cxx (parse_opt): Associate a bsdtar subshell with diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx index c03bbf9..9e8d556 100644 --- a/debuginfod/debuginfod.cxx +++ b/debuginfod/debuginfod.cxx @@ -429,8 +429,16 @@ parse_opt (int key, char *arg, scan_archives[".rpm"]="cat"; // libarchive groks rpm natively break; case 'U': - scan_archives[".deb"]="(bsdtar -O -x -f - data.tar.xz)<"; - scan_archives[".ddeb"]="(bsdtar -O -x -f - data.tar.xz)<"; + if (access("/usr/bin/dpkg-deb", X_OK) == 0) + { + scan_archives[".deb"]="dpkg-deb --fsys-tarfile"; + scan_archives[".ddeb"]="dpkg-deb --fsys-tarfile"; + } + else + { + scan_archives[".deb"]="(bsdtar -O -x -f - data.tar.xz)<"; + scan_archives[".ddeb"]="(bsdtar -O -x -f - data.tar.xz)<"; + } // .udeb too? break; case 'Z': -- 2.7.4