summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-08-09 16:33:23 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-08-13 17:56:10 +0200
commitd8b123b4b00bbc5094ff79491d2675b476087632 (patch)
tree3c0c05ba3f79a18e23c7e1585f75479591949a7d /desktop
parent93d641caceecb953fa268745c29a0c9fb30f6457 (diff)
updater: fix the updater path on windows
Change-Id: I69ff622c12a289c4ac240ee4a7313eeffc3203b9 Reviewed-on: https://gerrit.libreoffice.org/40987 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/updater.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index f284eab096e5..d1cd07d76f1e 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -274,8 +274,7 @@ bool update()
OUString aTempDirURL = aTempDir.GetURL();
CopyUpdaterToTempDir(Updater::getExecutableDirURL(), aTempDirURL);
- OUString aTempDirPath = getPathFromURL(aTempDirURL);
- OUString aUpdaterPath = aTempDirPath + "/" + OUString::fromUtf8(pUpdaterName);
+ OUString aUpdaterPath = getPathFromURL(aTempDirURL + "/" + OUString::fromUtf8(pUpdaterName));
Updater::log("Calling the updater with parameters: ");
CharT** pArgs = createCommandLine();
@@ -297,6 +296,7 @@ bool update()
}
else
{
+ SAL_WARN("desktop.updater", "Updater executable path: " << aUpdaterPath);
for (size_t i = 0; i < 8 + rtl_getAppCommandArgCount(); ++i)
{
SAL_WARN("desktop.updater", pArgs[i]);