diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-12-30 18:49:49 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-19 03:43:26 +0200 |
| commit | 5bfba54cf1d4ef2f346e7bccd4e660fc68fa38e0 (patch) | |
| tree | ed22e8ce46434720fb3b27108ea9ad1221e7ec94 /onlineupdate | |
| parent | d41a82fbde6450002069d86c0c9499eb7d4eaf10 (diff) | |
remove unnecessary case from updater code
Change-Id: I9001b661a929a66723cf8e83ed3d8f664f180b14
Diffstat (limited to 'onlineupdate')
| -rw-r--r-- | onlineupdate/source/update/updater/updater.cxx | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/onlineupdate/source/update/updater/updater.cxx b/onlineupdate/source/update/updater/updater.cxx index a055d9def673..eed6a0090695 100644 --- a/onlineupdate/source/update/updater/updater.cxx +++ b/onlineupdate/source/update/updater/updater.cxx @@ -223,7 +223,6 @@ static bool gSucceeded = false; static bool sStagedUpdate = false; static bool sReplaceRequest = false; static bool sUsingService = false; -static bool sIsOSUpdate = false; #ifdef _WIN32 // The current working directory specified in the command line. @@ -2417,7 +2416,7 @@ UpdateThreadFunc(void * /*param*/) } #endif - if (rv == OK && sStagedUpdate && !sIsOSUpdate) { + if (rv == OK && sStagedUpdate) { #ifdef TEST_UPDATER // The MOZ_TEST_SKIP_UPDATE_STAGE environment variable prevents copying // the files in dist/bin in the test updater when staging an update since @@ -2728,11 +2727,6 @@ int NS_main(int argc, NS_tchar **argv) } #endif - if (EnvHasValue("MOZ_OS_UPDATE")) { - sIsOSUpdate = true; - putenv(const_cast<char*>("MOZ_OS_UPDATE=")); - } - LogInit(gPatchDirPath, NS_T("update.log")); if (!WriteStatusFile("applying")) { @@ -3901,10 +3895,6 @@ GetManifestContents(const NS_tchar *manifest) int AddPreCompleteActions(ActionList *list) { - if (sIsOSUpdate) { - return OK; - } - #ifdef MACOSX std::unique_ptr<NS_tchar> manifestPath(get_full_path( NS_T("Contents/Resources/precomplete"))); |