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

[Markus Mohrhard]

 desktop/source/app/updater.cxx   |   14 ++++++++++++++
 desktop/source/app/updater.hxx   |    1 +
 uitest/libreoffice/connection.py |    1 -
 3 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 21f5966f123e20251a3ab7535b669693be1d8e6a
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Jun 12 01:09:09 2017 +0200

    remove debug print statement
    
    Change-Id: I419dd9311bc4fbb9fcd2e73a83c5272ecbec242d
    Reviewed-on: https://gerrit.libreoffice.org/38680
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/uitest/libreoffice/connection.py b/uitest/libreoffice/connection.py
index 81f10ab36910..cc1e6acd2b0f 100644
--- a/uitest/libreoffice/connection.py
+++ b/uitest/libreoffice/connection.py
@@ -82,7 +82,6 @@ class OfficeConnection:
         if 'LIBO_LANG' in environ:
             env = environ
             env['LC_ALL'] = environ['LIBO_LANG']
-            print(env)
 
         self.pro = subprocess.Popen(argv, env=env)
         return self.pro
commit 42aac9ef70d459dc85cb77333a08a4c9ab52955c
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Jun 11 07:47:53 2017 +0200

    better updater logging
    
    Change-Id: I6012f2159d058cbb2afb4b685badb8c870adf07b
    Reviewed-on: https://gerrit.libreoffice.org/38679
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index d6b5574bd2ba..1dac58923a3c 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -144,17 +144,20 @@ char** createCommandLine()
         OUString aPatchDir = Updater::getPatchDirURL();
         rtl::Bootstrap::expandMacros(aPatchDir);
         OUString aTempDirPath = getPathFromURL(aPatchDir);
+        Updater::log("Patch Dir: " + aTempDirPath);
         createStr(aTempDirPath, pArgs, 1);
     }
     {
         // the actual update directory
         OUString aInstallPath = getPathFromURL(aLibExecDirURL);
+        Updater::log("Install Dir: " + aInstallPath);
         createStr(aInstallPath, pArgs, 2);
     }
     {
         // the temporary updated build
         OUString aUpdateDirURL = Updater::getUpdateDirURL();
         OUString aWorkingDir = getPathFromURL(aUpdateDirURL);
+        Updater::log("Working Dir: " + aWorkingDir);
         createStr(aWorkingDir, pArgs, 3);
     }
     {
@@ -164,6 +167,7 @@ char** createCommandLine()
     {
         OUString aExeDir = Updater::getExecutableDirURL();
         OUString aSofficePath = getPathFromURL(aExeDir);
+        Updater::log("soffice Path: " + aSofficePath);
         createStr(aSofficePath, pArgs, 5);
     }
     {
@@ -215,8 +219,10 @@ void update()
     OUString aTempDirPath = getPathFromURL(aTempDirURL);
     OString aPath = OUStringToOString(aTempDirPath + "/" + OUString::fromUtf8(pUpdaterName), RTL_TEXTENCODING_UTF8);
 
+    Updater::log("Calling the updater with parameters: ");
     char** pArgs = createCommandLine();
 
+
 #if UNX
     if (execv(aPath.getStr(), pArgs))
     {
@@ -730,4 +736,12 @@ void Updater::log(const OString& rMessage)
     aLog.WriteLine(rMessage);
 }
 
+void Updater::log(const char* pMessage)
+{
+    OUString aUpdateLog = getUpdateInfoLog();
+    SvFileStream aLog(aUpdateLog, StreamMode::STD_READWRITE);
+    aLog.Seek(aLog.Tell() + aLog.remainingSize()); // make sure we are at the end
+    aLog.WriteCharPtr(pMessage);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/updater.hxx b/desktop/source/app/updater.hxx
index f3f28bc638ec..922d5264ec5e 100644
--- a/desktop/source/app/updater.hxx
+++ b/desktop/source/app/updater.hxx
@@ -30,6 +30,7 @@ public:
 
     static void log(const OUString& rMessage);
     static void log(const OString& rMessage);
+    static void log(const char* pMessage);
 };
 
 #endif