Kaydet (Commit) 5daa3a1c authored tarafından Markus Mohrhard's avatar Markus Mohrhard

updater: make it easier to test some parts of the updating code

Change-Id: I7f3758eb8c12d912a47ac3a3c632347e6e124601
üst 3f8a48f5
......@@ -1427,6 +1427,7 @@ int Desktop::Main()
osl::DirectoryItem::get(Updater::getUpdateFileURL(), aUpdateFile);
const char* pUpdaterTestUpdate = std::getenv("LIBO_UPDATER_TEST_UPDATE");
const char* pForcedUpdateCheck = std::getenv("LIBO_UPDATER_TEST_UPDATE_CHECK");
if (pUpdaterTestUpdate || aUpdateFile.is())
{
OUString aBuildID("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":buildid}");
......@@ -1446,7 +1447,7 @@ int Desktop::Main()
if (bSuccess)
return EXIT_SUCCESS;
}
else if (isTimeForUpdateCheck())
else if (isTimeForUpdateCheck() || pForcedUpdateCheck)
{
sal_uInt64 nNow = tools::Time::GetSystemTicks();
Updater::log("Update Check Time: " + OUString::number(nNow));
......
......@@ -678,6 +678,13 @@ void update_checker()
OUString aProductName = utl::ConfigManager::getProductName();
OUString aBuildID = Updater::getBuildID();
static const char* pBuildIdEnv = std::getenv("LIBO_UPDATER_BUILD");
if (pBuildIdEnv)
{
aBuildID = OUString::createFromAscii(pBuildIdEnv);
}
OUString aBuildTarget = "${_OS}_${_ARCH}";
rtl::Bootstrap::expandMacros(aBuildTarget);
OUString aChannel = officecfg::Office::Update::Update::UpdateChannel::get();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment