summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-09-23 14:01:33 +0200
committerAndras Timar <andras.timar@collabora.com>2015-10-02 14:58:36 +0200
commitdcdb228bda38090aa75ddb5c8c7b9a1c11e2e4b9 (patch)
tree91de1809fb244da309c633ca7963187f76c28e74
parentda08a8f277b6a7f0f0a96715a8dac8fadc87258c (diff)
Better fail with E_EXIST if rename(3) fails
...it leads to better handling of the failure downstream, if e.g. this is an attempt to copy a file from the presets to an existing file of a previously partly generated UserInstallation, and the presets and the UserInstallation are on different drives and rename(3) fails with EXDEV. (Without this fix, removing the UserInstallation's registrymodifications.xcu caused restarting soffice to fail with "User installation could not be completed" in this case; regression introduced with 6edbcc1b231feb02f304ff646c323b5df051d9a4 "cid#1242936 handle rename failure.") Change-Id: I409698c4e2e6cc6ccd8b2be80a393c9657b5125d (cherry picked from commit d2a7abebf210cacf9ea357dd8b4a0772be7308df) Reviewed-on: https://gerrit.libreoffice.org/18899 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--sal/osl/unx/file_misc.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index abb7a184df39..522e85b43aaf 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -816,7 +816,7 @@ static oslFileError oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char*
"sal.osl",
"rename(" << pszDestFileName << ", " << tmpDestFile
<< ") failed with errno " << e);
- return osl_File_E_BUSY; // for want of a better error code
+ return osl_File_E_EXIST; // for want of a better error code
}
}
}