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

[Markus Mohrhard]

 desktop/source/app/app.cxx                     |    1 +
 onlineupdate/source/update/updater/updater.cxx |    3 +++
 2 files changed, 4 insertions(+)

New commits:
commit cff13c4b34430c2f70a70d96e758a8278db8f5ca
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Aug 2 05:39:19 2017 +0200

    updater: log the update check time
    
    Change-Id: I41092b3548715a89baf9d795aa58c87a0e1621b2
    Reviewed-on: https://gerrit.libreoffice.org/40658
    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 a8d066cd032f..dffa9a7ebc95 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1444,6 +1444,7 @@ int Desktop::Main()
             else if (isTimeForUpdateCheck())
             {
                 sal_uInt64 nNow = tools::Time::GetSystemTicks();
+                Updater::log("Update Check Time: " + OUString::number(nNow));
                 std::shared_ptr< comphelper::ConfigurationChanges > batch(
                         comphelper::ConfigurationChanges::create());
                 officecfg::Office::Update::Update::LastUpdateTime::set(nNow, batch);
commit 9d3654668ec7d4a7e6e3627dde86093e8db18c0d
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Aug 2 03:37:55 2017 +0200

    updater: disable the special handling of the user profile
    
    This should be unnecessary for the one step updating strategy.
    
    Change-Id: I8dddeae4fb4a560a1c261c0c2e84183d72fc638c
    Reviewed-on: https://gerrit.libreoffice.org/40656
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/onlineupdate/source/update/updater/updater.cxx b/onlineupdate/source/update/updater/updater.cxx
index 08aa201cb47e..8a1ef8bf5b24 100644
--- a/onlineupdate/source/update/updater/updater.cxx
+++ b/onlineupdate/source/update/updater/updater.cxx
@@ -332,6 +332,8 @@ namespace {
 
 bool is_userprofile_in_instdir()
 {
+    return false;
+    /*
     // the algorithm is:
     // 1.) if userprofile path length is smaller than installation dir,
     //      the profile is surely not in instdir
@@ -350,6 +352,7 @@ bool is_userprofile_in_instdir()
         return false;
 
     return NS_tstrncmp(userprofile, gInstallDirPath, installdir_len) == 0;
+    */
 }
 
 }