} keys %opts_opt_map;
sub parseopts_late_defaults();
+sub quiltify_trees_differ ($$;$$$);
sub setup_gitattrs(;$);
sub check_gitattrs($$);
return 0;
}
if ($tip_patches eq '' and
- !defined git_cat_file "$walk:debian") {
+ !defined git_cat_file "$walk~:debian" and
+ !quiltify_trees_differ "$walk~", $walk
+ ) {
# (gdr classification of parent: BreakwaterStart
printdebug "branch_is_gdr $walk unmarked BreakwaterStart YES\n";
return 1;
"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{^/}) {
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 ?";
# 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!",