chiark / gitweb /
dgit: After downloading .debian.* files, save them in `..', too
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 10 Jan 2017 13:43:10 +0000 (13:43 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 10 Jan 2017 14:06:39 +0000 (14:06 +0000)
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>
debian/changelog
dgit

index 7154fda..bc75930 100644 (file)
@@ -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 eee1806..eae6f24 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