From 823328ead2c826010954dba38251f3fb248ebc09 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Mon, 20 Jan 2020 16:02:40 +0100 Subject: [PATCH] sync: fix file merging when using symlinks --- admin/sync/importer_localfs.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/sync/importer_localfs.go b/admin/sync/importer_localfs.go index 263c3d1a..515be07a 100644 --- a/admin/sync/importer_localfs.go +++ b/admin/sync/importer_localfs.go @@ -44,11 +44,11 @@ func (i LocalImporter) importFile(URI string, next func(string, string) (interfa if i.exists(URI) { os.Symlink(i.toURL(URI), dest) + return next(dest, URI) } else { os.Symlink(i.toURL(URI) + "_MERGED", dest) + return ImportFile(i, URI, next) } - - return next(dest, URI) } else { return ImportFile(i, URI, next) }