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 7154fdada46994c617539f81ec9f2b445c276fb2..bc75930591618d4f9d5dc3de7b8edfecb5b0ca1f 100644 (file)
--- 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 eee1806c74eb484de11007fec42daed71fba4997..eae6f24bde3895f21cf05a7b0e62869b24c821b9 100755 (executable)
--- 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