[devscripts] 01/02: uscan: decompress with the original file kept

[Osamu Aoki]

This is an automated email from the git hooks/post-receive script.

osamu pushed a commit to branch master
in repository devscripts.

commit 98854fc83f5bd9cca2751dc1b45bedfbdc4aea55
Author: Osamu Aoki <osamu at debian.org>
Date:   Sun Jan 31 17:13:14 2016 +0900

    uscan: decompress with the original file kept
---
 debian/changelog | 2 ++
 scripts/uscan.pl | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bbdba26..6379b61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,8 @@ devscripts (2.16.1) UNRELEASED; urgency=medium
     - Fix regressions and glitches in the prioritizing mechanism of packages.
       (Closes: #809604)
     - Fix regressions of the verbosety. (Closes: #809541, #809554)
+    - Keep the original compressed file when decompressing it for the
+      signature verification. (Closes: #812860)
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 05 Jan 2016 13:01:05 -0200
 
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 73b6474..0765c04 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -3444,7 +3444,7 @@ EOF
 	    $suffix =~ s/.*?(\.gz|\.xz|\.bz2|\.lzma)?$/$1/;
 	    if ($suffix eq '.gz') {
 		if ( -x '/bin/gunzip') {
-		    system('/bin/gunzip', "$destdir/$sigfile_base");
+		    system('/bin/gunzip', "--keep", "$destdir/$sigfile_base");
 		    $sigfile_base =~ s/(.*?)\.gz/$1/;
 		} else {
 		    uscan_warn("Please install gzip.\n");
@@ -3452,7 +3452,7 @@ EOF
 		}
 	    } elsif ($suffix eq '.xz') {
 		if ( -x '/usr/bin/unxz') {
-		    system('/usr/bin/unxz', "$destdir/$sigfile_base");
+		    system('/usr/bin/unxz', "--keep", "$destdir/$sigfile_base");
 		    $sigfile_base =~ s/(.*?)\.xz/$1/;
 		} else {
 		    uscan_warn("Please install xz-utils.\n");
@@ -3460,7 +3460,7 @@ EOF
 		}
 	    } elsif ($suffix eq '.bz2') {
 		if ( -x '/bin/bunzip2') {
-		    system('/bin/bunzip2', "$destdir/$sigfile_base");
+		    system('/bin/bunzip2', "--keep", "$destdir/$sigfile_base");
 		    $sigfile_base =~ s/(.*?)\.bz2/$1/;
 		} else {
 		    uscan_warn("Please install bzip2.\n");
@@ -3468,7 +3468,7 @@ EOF
 		}
 	    } elsif ($suffix eq '.lzma') {
 		if ( -x '/usr/bin/unlzma') {
-		    system('/usr/bin/unlzma', "$destdir/$sigfile_base");
+		    system('/usr/bin/unlzma', "--keep", "$destdir/$sigfile_base");
 		    $sigfile_base =~ s/(.*?)\.lzma/$1/;
 		} else {
 		    uscan_warn "Please install xz-utils or lzma.\n";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git