Backed out changeset 91bfef9d7343 (bug 1527374) for causing merge conflicts CLOSED TREE
authorCiure Andrei <aciure@mozilla.com>
Wed, 13 Feb 2019 07:32:24 +0200
changeset 458855 ea8190021659
parent 458854 9f93017d5be0
child 458856 3d229a34ca4d
child 458973 03c808feaf89
push id35549
push userarchaeopteryx@coole-files.de
push dateWed, 13 Feb 2019 10:24:09 +0000
treeherdermozilla-central@3d229a34ca4d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1527374
milestone67.0a1
backs out91bfef9d7343
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 91bfef9d7343 (bug 1527374) for causing merge conflicts CLOSED TREE
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4240,19 +4240,17 @@ int XREMain::XRE_mainStartup(bool* aExit
   bool cachesOK;
   bool isDowngrade;
   nsCString lastVersion;
   bool versionOK = CheckCompatibility(
       mProfD, version, osABI, mDirProvider.GetGREDir(), mAppData->directory,
       flagFile, &cachesOK, &isDowngrade, lastVersion);
 
 #ifdef MOZ_BLOCK_PROFILE_DOWNGRADE
-  // The argument check must come first so the argument is always removed from
-  // the command line regardless of whether this is a downgrade or not.
-  if (!CheckArg("allow-downgrade") && isDowngrade) {
+  if (isDowngrade && !CheckArg("allow-downgrade")) {
     rv = CheckDowngrade(mProfD, mProfLD, mProfileName, mNativeApp, mProfileSvc,
                         lastVersion);
     if (rv == NS_ERROR_LAUNCHED_CHILD_PROCESS || rv == NS_ERROR_ABORT) {
       *aExitFlag = true;
       return 0;
     }
   }
 #endif