Bug 1488857 - Correctly detect the current dev edition version for showing stub installer profile reset prompts. r=agashlin
authorMatt Howell <mhowell@mozilla.com>
Wed, 05 Sep 2018 20:55:04 +0000
changeset 434837 6f19fdfde8fbfa2652cade5616bac2a6b0d9aabe
parent 434836 5cd83e5b3ea002480c8a6a53f1706cff4808f8a9
child 434838 a9fd0a6da9c15dc5cff8bea67c94dc6ca35e9152
push id68817
push usermhowell@mozilla.com
push dateWed, 05 Sep 2018 20:56:16 +0000
treeherderautoland@6f19fdfde8fb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersagashlin
bugs1488857
milestone64.0a1
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
Bug 1488857 - Correctly detect the current dev edition version for showing stub installer profile reset prompts. r=agashlin Also remove a useless line that looks like some debugging code I accidentally left in. Differential Revision: https://phabricator.services.mozilla.com/D5059
browser/installer/windows/nsis/stub.nsi
--- a/browser/installer/windows/nsis/stub.nsi
+++ b/browser/installer/windows/nsis/stub.nsi
@@ -1750,18 +1750,16 @@ Function LaunchHelpPage
   ${EndIf}
 FunctionEnd
 
 Function OpenManualDownloadURL
   ExecShell "open" "${URLManualDownload}${URLManualDownloadAppend}"
 FunctionEnd
 
 Function ShouldPromptForProfileCleanup
-  Call GetLatestReleasedVersion
-
   ; This will be our return value.
   StrCpy $ProfileCleanupPromptType 0
 
   ; Only consider installations of the same architecture we're installing.
   ${If} $DroplistArch == "$(VERSION_64BIT)"
     SetRegView 64
   ${Else}
     SetRegView 32
@@ -1894,17 +1892,17 @@ Function GetLatestReleasedVersion
   nsJSON::Set /http requestConfig
   IfErrors end
   ${Select} ${Channel}
   ${Case} "unofficial"
     StrCpy $1 "FIREFOX_NIGHTLY"
   ${Case} "nightly"
     StrCpy $1 "FIREFOX_NIGHTLY"
   ${Case} "aurora"
-    StrCpy $1 "FIREFOX_AURORA"
+    StrCpy $1 "FIREFOX_DEVEDITION"
   ${Case} "beta"
     StrCpy $1 "LATEST_FIREFOX_RELEASED_DEVEL_VERSION"
   ${Case} "release"
     StrCpy $1 "LATEST_FIREFOX_VERSION"
   ${EndSelect}
   nsJSON::Get "Output" $1 /end
   IfErrors end
   Pop $1