If we cannot hardlink origs into our extraction area, use symlinks instead.

Closes:#844570.

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

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 1bac97bde55d02a5cc00e0ba388348f7f8537012..50e3b860a71ae409c6d803b1cd36788f7617e61a 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -289,7 +289,9 @@ sub link_ltarget ($$) {
     if (-l _) {
        $old = cmdoutput qw(realpath  --), $old;
     }
     if (-l _) {
        $old = cmdoutput qw(realpath  --), $old;
     }

-    link $old, $new or die "link $old $new: $!";
+    my $r = link $old, $new;
+    $r = symlink $old, $new if !$r && $!==EXDEV;
+    $r or die "(sym)link $old $new: $!";

 }
 
 sub hashfile ($) {
 }
 
 sub hashfile ($) {

diff --git a/debian/changelog b/debian/changelog
index d2127cdbf999ef8af5c5b24feca47ed244615d06..907e5e9524a0f0daa0a4b311156cb2715d883f86 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ dgit (2.12~) unstable; urgency=medium
   * Give better advice if .dsc/.changes signing fails: if no changes
     are needed to the package, user may indeed just debsign and dput.
     Closes:#844131.
   * Give better advice if .dsc/.changes signing fails: if no changes
     are needed to the package, user may indeed just debsign and dput.
     Closes:#844131.

+  * If we cannot hardlink origs into our extraction area, use symlinks
+    instead.  Closes:#844570.

 
   Test suite:
   * Provide and use stunt lintian and debuild, to avoid lintian
 
   Test suite:
   * Provide and use stunt lintian and debuild, to avoid lintian