[Libreoffice-commits] online.git: kit/Kit.cpp
Samuel Mehrbrodt
Samuel.Mehrbrodt at cib.de
Mon Mar 27 08:41:32 UTC 2017
kit/Kit.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0b91533abb56bd81fa63f2ad85c2bd9bbc523f2c
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date: Fri Mar 24 14:18:46 2017 +0100
Don't try to copy the file when it already exists
Without this, 'make run' fails for me
Change-Id: I7fd3c39a0443d9f5d70af2382e498cd5c10435d8
Reviewed-on: https://gerrit.libreoffice.org/35649
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 58f79b28..f227af9f 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -149,7 +149,7 @@ namespace
case FTW_F:
case FTW_SLN:
File(newPath.parent()).createDirectories();
- if (link(fpath, newPath.toString().c_str()) == -1)
+ if (link(fpath, newPath.toString().c_str()) == -1 && errno != EEXIST)
{
LOG_SYS("link(\"" << fpath << "\", \"" <<
newPath.toString() << "\") failed. Will copy.");
More information about the Libreoffice-commits
mailing list