From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 8 Jul 2017 19:11:23 +0000 (+0100)
Subject: dgit: avoid dying with wrong message if compression fails
X-Git-Tag: archive/debian/3.11~10
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=inline;h=d49ec0833c03e428cc5a807331b389f1a70cab74;p=dgit.git

dgit: avoid dying with wrong message if compression fails

When dgit intended to report a decompressor had failed, it would
instead crash with no useful message.  This was due to
generate_commits_from_dsc's @compr_cmd being shadowed inside
the if $compr_ext.

This is part of #857694.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index 43f3fd38..6f988132 100755
--- a/dgit
+++ b/dgit
@@ -2181,7 +2181,7 @@ sub generate_commits_from_dsc () {
 		if defined $compr_ext && !defined $cname;
 	    my $compr_proc =
 		new Dpkg::Compression::Process compression => $cname;
-	    my @compr_cmd = $compr_proc->get_uncompress_cmdline();
+	    @compr_cmd = $compr_proc->get_uncompress_cmdline();
 	    my $compr_fh = new IO::Handle;
 	    my $compr_pid = open $compr_fh, "-|" // die $!;
 	    if (!$compr_pid) {