From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 10 Jan 2017 13:43:10 +0000 (+0000)
Subject: dgit: After downloading .debian.* files, save them in `..', too
X-Git-Tag: archive/debian/3.1~9
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=3fb35c205e2ee6e020c2e0173eb2d9c48a099617

dgit: After downloading .debian.* files, save them in `..', too

Ie do this not just for .origs.  We don't want the user needlessly
re-downloading them on each fetch.

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

diff --git a/debian/changelog b/debian/changelog
index 7154fdad..bc759305 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ dgit (3.1~) unstable; urgency=medium
   Bugfixes:
   * dgit import-dsc: Do not crash with undefined $isuite.  Closes:#850781.
   * dgit: Do not nedlessly re-fetch the rewrite map.
+  * dgit: After downloading .debian.* files, save them in `..', too
+    (ie do this not just for .origs).
 
   Test suite:
   * Add test for import-dsc with default distro.  (Detects #850781.)
diff --git a/dgit b/dgit
index eee1806c..eae6f24b 100755
--- a/dgit
+++ b/dgit
@@ -2083,11 +2083,9 @@ sub generate_commits_from_dsc () {
 	complete_file_from_dsc('.', $fi)
 	    or next;
 
-	if (is_orig_file_in_dsc($f, \@dfi)) {
-	    link $f, "../../../../$f"
-		or $!==&EEXIST
-		or die "$f $!";
-	}
+	link $f, "../../../../$f"
+	    or $!==&EEXIST
+	    or die "$f $!";
     }
 
     # We unpack and record the orig tarballs first, so that we only