[Libreoffice-commits] core.git: 2 commits - desktop/source

[Markus Mohrhard]

 desktop/source/app/app.cxx     |    2 +-
 desktop/source/app/updater.cxx |   13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit d8b123b4b00bbc5094ff79491d2675b476087632
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Aug 9 16:33:23 2017 +0200

    updater: fix the updater path on windows
    
    Change-Id: I69ff622c12a289c4ac240ee4a7313eeffc3203b9
    Reviewed-on: https://gerrit.libreoffice.org/40987
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

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]);
commit 93d641caceecb953fa268745c29a0c9fb30f6457
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Aug 9 15:43:36 2017 +0200

    updater: use desktop.updater log scope consistently
    
    Change-Id: I242890aeda4820ada6f06e4cbe01b73d5faf549e
    Reviewed-on: https://gerrit.libreoffice.org/40924
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index cc5e59dcda9b..7557e78a414b 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1403,7 +1403,7 @@ int Desktop::Main()
                 {
                     if (!aSeeAlso.isEmpty())
                     {
-                        SAL_INFO("updater", "See also: " << aSeeAlso);
+                        SAL_INFO("desktop.updater", "See also: " << aSeeAlso);
                                 Reference< css::system::XSystemShellExecute > xSystemShell(
                         SystemShellExecute::create(::comphelper::getProcessComponentContext()) );
 
diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index 6c0206059a6a..f284eab096e5 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -297,7 +297,6 @@ bool update()
     }
     else
     {
-        SAL_WARN("updater", "Executable Path:" << aUpdaterPath);
         for (size_t i = 0; i < 8 + rtl_getAppCommandArgCount(); ++i)
         {
             SAL_WARN("desktop.updater", pArgs[i]);
@@ -378,13 +377,13 @@ update_file parse_update_file(const orcus::json::detail::node& rNode)
 {
     if (rNode.type() != orcus::json::detail::node_t::object)
     {
-        SAL_WARN("desktop.update", "invalid update or language file entry");
+        SAL_WARN("desktop.updater", "invalid update or language file entry");
         throw invalid_update_info();
     }
 
     if (rNode.child_count() < 4)
     {
-        SAL_WARN("desktop.update", "invalid update or language file entry");
+        SAL_WARN("desktop.updater", "invalid update or language file entry");
         throw invalid_update_info();
     }
 
@@ -395,7 +394,7 @@ update_file parse_update_file(const orcus::json::detail::node& rNode)
 
     if (aHashTypeNode.string_value() != "sha512")
     {
-        SAL_WARN("desktop.update", "invalid hash type");
+        SAL_WARN("desktop.updater", "invalid hash type");
         throw invalid_update_info();
     }
 
@@ -419,7 +418,7 @@ update_info parse_response(const std::string& rResponse)
     auto aDocumentRoot = aJsonDoc.get_document_root();
     if (aDocumentRoot.type() != orcus::json_node_t::object)
     {
-        SAL_WARN("desktop.Update", "invalid root entries: " << rResponse);
+        SAL_WARN("desktop.updater", "invalid root entries: " << rResponse);
         throw invalid_update_info();
     }