Backed out changeset 91bfef9d7343 (bug 1527374) for causing merge conflict. a=backout
authorRazvan Maries <rmaries@mozilla.com>
Wed, 13 Feb 2019 07:21:11 +0200
changeset 458731 875a93046d849ffe16d8a1c71d335ed92a69c61d
parent 458730 636d2c00234df8e0d8fb3a058dba9dda0ccd1772
child 458840 1af69c96ec5f4eafb409b844b72dc1740b9ab1a0
push id35547
push userrmaries@mozilla.com
push dateWed, 13 Feb 2019 05:21:47 +0000
treeherdermozilla-central@875a93046d84 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1527374
milestone67.0a1
backs out91bfef9d734352f967e9ef032966bd11d1f04b6a
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 conflict. a=backout
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