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

[Markus Mohrhard]

 bin/update/create_partial_update.py |    2 +-
 desktop/source/app/updater.cxx      |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit ea9030461df4610225376301a72cf0cd7ea631e8
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat May 27 17:26:53 2017 +0200

    fix construction of directory path
    
    Change-Id: I5fa7ce762ae7e429f685a52b0fed1a1f120da8dd

diff --git a/bin/update/create_partial_update.py b/bin/update/create_partial_update.py
index 232cc68bfe1a..aa5a119166db 100755
--- a/bin/update/create_partial_update.py
+++ b/bin/update/create_partial_update.py
@@ -67,7 +67,7 @@ def download_mar_for_update_channel_and_platform(config, platform, temp_dir):
     downloaded_updates = {}
     for update_file in update_files:
         build = update_file["build"]
-        filedir = temp_dir + build
+        filedir = os.path.join(temp_dir, build)
 
         mkdir_p(filedir)
 
commit d33a0917b2b18486811b08007af0b1d8cb3ab9d6
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat May 27 17:26:13 2017 +0200

    allow to override settings based updater URL and channel through env
    
    Change-Id: Ie2d96c1f6c15f91db6410997185161e5fb443dfc

diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index 5d60916ec700..d6b5574bd2ba 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -598,6 +598,11 @@ void download_file(const OUString& rURL, size_t nFileSize, const OUString& rHash
 void update_checker()
 {
     OUString aDownloadCheckBaseURL = officecfg::Office::Update::Update::URL::get();
+    static const char* pDownloadCheckBaseURLEnv = std::getenv("LIBO_UPDATER_URL");
+    if (pDownloadCheckBaseURLEnv)
+    {
+        aDownloadCheckBaseURL = OUString::createFromAscii(pDownloadCheckBaseURLEnv);
+    }
 
     OUString aProductName = utl::ConfigManager::getProductName();
     OUString aBuildID("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":buildid}");
@@ -605,6 +610,11 @@ void update_checker()
     OUString aBuildTarget = "${_OS}_${_ARCH}";
     rtl::Bootstrap::expandMacros(aBuildTarget);
     OUString aChannel = officecfg::Office::Update::Update::UpdateChannel::get();
+    static const char* pUpdateChannelEnv = std::getenv("LIBO_UPDATER_CHANNEL");
+    if (pUpdateChannelEnv)
+    {
+        aChannel = OUString::createFromAscii(pUpdateChannelEnv);
+    }
 
     OUString aDownloadCheckURL = aDownloadCheckBaseURL + "update/check/1/" + aProductName +
         "/" + aBuildID + "/" + aBuildTarget + "/" + aChannel;