sync: fix file merging when using symlinks
This commit is contained in:
parent
4e258cb30d
commit
823328ead2
|
@ -44,11 +44,11 @@ func (i LocalImporter) importFile(URI string, next func(string, string) (interfa
|
||||||
|
|
||||||
if i.exists(URI) {
|
if i.exists(URI) {
|
||||||
os.Symlink(i.toURL(URI), dest)
|
os.Symlink(i.toURL(URI), dest)
|
||||||
|
return next(dest, URI)
|
||||||
} else {
|
} else {
|
||||||
os.Symlink(i.toURL(URI) + "_MERGED", dest)
|
os.Symlink(i.toURL(URI) + "_MERGED", dest)
|
||||||
|
return ImportFile(i, URI, next)
|
||||||
}
|
}
|
||||||
|
|
||||||
return next(dest, URI)
|
|
||||||
} else {
|
} else {
|
||||||
return ImportFile(i, URI, next)
|
return ImportFile(i, URI, next)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user