X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=f33aab8c0838fb93a0c7357a19ad1fd1563f6df1;hb=6c9a2bed0e895579ee058c186428e654f6324d09;hp=3032c56d5f3f7a7178b41dd69e5a67e6a125905d;hpb=7adb1a2ff884501c97fbb92b4b91337929c047fd;p=dgit.git

diff --git a/dgit b/dgit
index 3032c56d..f33aab8c 100755
--- a/dgit
+++ b/dgit
@@ -2234,7 +2234,7 @@ sub dotdot_bpd_transfer_origs ($$$) {
 	    "check orig file %s in ..: %s", $leaf, $!;
 	if (-l _) {
 	    stat "$dotdot/$leaf" or fail f_
-		"check targe of orig symlink %s in ..: %s", $leaf, $!;
+		"check target of orig symlink %s in ..: %s", $leaf, $!;
 	    my $ltarget = readlink "$dotdot/$leaf" or
 		die "readlink $dotdot/$leaf: $!";
 	    if ($ltarget !~ m{^/}) {
@@ -7018,6 +7018,7 @@ END
 	    fail f_ "lstat %s works but stat gives %s !", $here, $!;
 	}
 	fail f_ "stat %s: %s", $here, $! unless $! == ENOENT;
+	printdebug "not in bpd, $f ...\n";
 	# $f does not exist in bpd, we need to transfer it
 	my $there = $dscfn;
 	$there =~ s{[^/]+$}{$f} or confess "$there ?";
@@ -7032,12 +7033,15 @@ END
 		# abs2rel, despite its name, can take two relative paths
 		$there = File::Spec->abs2rel($there,$buildproductsdir);
 		# now $there is relative to bpd, great
+		printdebug "not in bpd, $f, abs2rel, $there ...\n";
 	    } else {
 		$there = (dirname $maindir)."/$there_from_parent";
 		# now $there is absoute
+		printdebug "not in bpd, $f, rel2rel, $there ...\n";
 	    }
 	} elsif ($there =~ m#^/#) {
 	    # $there is absolute already
+	    printdebug "not in bpd, $f, abs, $there ...\n";
 	} else {
 	    fail f_
 		"cannot import %s which seems to be inside working tree!",