[Libreoffice-commits] online.git: kit/Kit.cpp

[Samuel Mehrbrodt]

 kit/Kit.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fd5df2f1da9b4199d729f5a1b9e7beb58ae3d7f0
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Mon Mar 27 13:02:02 2017 +0000

    Revert "Don't try to copy the file when it already exists"
    
    This reverts commit 0b91533abb56bd81fa63f2ad85c2bd9bbc523f2c.
    
    Change-Id: Ic672cca1ba26cd926923632d27ea8bb9a64495b5
    Reviewed-on: https://gerrit.libreoffice.org/35758
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index f227af9f..58f79b28 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 && errno != EEXIST)
+            if (link(fpath, newPath.toString().c_str()) == -1)
             {
                 LOG_SYS("link(\"" << fpath << "\", \"" <<
                         newPath.toString() << "\") failed. Will copy.");