From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 28 Aug 2013 22:08:06 +0000 (+0100)
Subject: Do not always pointlessly fetch the .dsc twice.  (That code was erroneously duplicate... 
X-Git-Tag: debian/0.13_experimental1~1^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=28789232f5edcc1c24bbb4bfe3b5e12119e9886e;p=dgit.git

Do not always pointlessly fetch the .dsc twice.  (That code was erroneously duplicated during editing, apparently.)
---

diff --git a/debian/changelog b/debian/changelog
index cb80d511..be670ab2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dgit (0.13) unstable; urgency=low
 
   * Reuse already-downloaded .orig files after checking their hashes.
     Closes: #720526.  (This introduces a dependency on the Digest::SHA.)
+  * Do not always pointlessly fetch the .dsc twice.  (That code was
+    erroneously duplicated during editing, apparently.)
   * Remove DGET_UNPACK from the environment in case the user has set it.
   * Remove scary warning from Description.
 
diff --git a/dgit b/dgit
index 4550a86d..9d1570c7 100755
--- a/dgit
+++ b/dgit
@@ -443,8 +443,6 @@ sub get_archive_dsc () {
 	$dscurl = access_cfg('mirror').$subpath;
 	$dscdata = url_get($dscurl);
 	next unless defined $dscdata;
-	$dscurl = access_cfg('mirror').$subpath;
-	$dscdata = url_get($dscurl);
 	my $dscfh = new IO::File \$dscdata, '<' or die $!;
 	print DEBUG Dumper($dscdata) if $debug>1;
 	$dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1);