Backout changeset 88ba9f723934 (bug 1502457) for causing bug 1507838 and bug 1508836
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 21 Nov 2018 09:05:41 +0900
changeset 503845 31766e8403ad17eb5b384c52750cbb49d1327e2e
parent 503844 7720051470685844a99bc96d95e1e86d21041f1d
child 503846 5811255ebed472776307973f7accb779fbf00028
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1502457, 1507838, 1508836
milestone65.0a1
backs out88ba9f723934257d34fde00d87b5ed4f54e258ca
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
Backout changeset 88ba9f723934 (bug 1502457) for causing bug 1507838 and bug 1508836
build/moz.configure/init.configure
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -1149,39 +1149,23 @@ set_config('MOZILLA_SYMBOLVERSION', mile
 # JS configure still wants to look at these.
 add_old_configure_assignment('MOZILLA_VERSION', milestone.version)
 add_old_configure_assignment('MOZILLA_SYMBOLVERSION', milestone.symbolversion)
 
 set_config('MOZ_APP_VERSION', milestone.app_version)
 set_config('MOZ_APP_VERSION_DISPLAY', milestone.app_version_display)
 add_old_configure_assignment('MOZ_APP_VERSION', milestone.app_version)
 
-
-# The app update channel is 'default' when not supplied, and MOZILLA_OFFICIAL
-# is not set. When MOZILLA_OFFICIAL is set, the default is derived from
-# the application display version.
-@depends(milestone, mozilla_official)
-def default_update_channel(milestone, mozilla_official):
-    if not mozilla_official:
-        return 'default'
-    if milestone.is_release_or_beta:
-        if 'esr' in milestone.app_version_display:
-            return 'esr'
-        if 'b' in milestone.app_version_display:
-            return 'beta'
-        return 'release'
-    if milestone.is_nightly:
-        return 'nightly'
-    return 'default'
-
-
+# The app update channel is 'default' when not supplied. The value is used in
+# the application's confvars.sh (and is made available to a project specific
+# moz.configure).
 option('--enable-update-channel',
        nargs=1,
        help='Select application update channel',
-       default=default_update_channel)
+       default='default')
 
 
 @depends('--enable-update-channel')
 def update_channel(channel):
     if channel[0] == '':
         return 'default'
     return channel[0].lower()