chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: Handle EXDEV when saving origs
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index d443c34db76daed99736e2c4d037b791cdcfa29b..6b961f5d7f271da70c3952dd19ea972e9e882767 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-2224,18
+2224,18
@@
sub generate_commits_from_dsc () {
printdebug "considering saving $f: ";
printdebug "considering saving $f: ";
- if (
link
$f, $upper_f) {
+ if (
rename_link_xf 1,
$f, $upper_f) {
printdebug "linked.\n";
printdebug "linked.\n";
- } elsif ((printdebug "($
!
) "),
+ } elsif ((printdebug "($
@
) "),
$! != EEXIST) {
$! != EEXIST) {
- fail f_ "saving %s: %s", "$buildproductsdir/$f", $
!
;
+ fail f_ "saving %s: %s", "$buildproductsdir/$f", $
@
;
} elsif (!$refetched) {
printdebug "no need.\n";
} elsif (!$refetched) {
printdebug "no need.\n";
- } elsif (
link
$f, "$upper_f,fetch") {
+ } elsif (
rename_link_xf 1,
$f, "$upper_f,fetch") {
printdebug "linked (using ...,fetch).\n";
printdebug "linked (using ...,fetch).\n";
- } elsif ((printdebug "($
!
) "),
+ } elsif ((printdebug "($
@
) "),
$! != EEXIST) {
$! != EEXIST) {
- fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $
!
;
+ fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $
@
;
} else {
printdebug "cannot.\n";
}
} else {
printdebug "cannot.\n";
}