Update client.py to pull from mozilla-release by default a=releasemerge ba=releasemerge CLOSED TREE default tip
authorPatrick Cloke <clokep@gmail.com>
Mon, 07 May 2018 17:50:11 -0400
changeset 31472 660476b2868e
parent 31471 77e12339f59b
push id383
push userclokep@gmail.com
push date2018-05-07 21:52 +0000
reviewersreleasemerge
Update client.py to pull from mozilla-release by default a=releasemerge ba=releasemerge CLOSED TREE
client.py
mail/confvars.sh
old mode 100755
new mode 100644
--- a/client.py
+++ b/client.py
@@ -17,17 +17,17 @@ DEFAULTS = {
       'CHATZILLA_REV':  'SEA2_48_RELBRANCH',
 
     # URL of the default hg repository to clone for DOM Inspector.
     'INSPECTOR_REPO': 'https://hg.mozilla.org/dom-inspector/',
     # The stable revision to use
       'INSPECTOR_REV':  'DOMI_2_0_17',
 
     # URL of the default hg repository to clone for Mozilla.
-    'MOZILLA_REPO': 'https://hg.mozilla.org/releases/mozilla-beta/',
+    'MOZILLA_REPO': 'https://hg.mozilla.org/releases/mozilla-release/',
 }
 
 REPO_SHORT_NAMES = {
     'mozilla-central':  'moz',
     'dom-inspector':    'dom',
 }
 
 
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -29,19 +29,19 @@ THUNDERBIRD_VERSION=$MOZ_APP_VERSION
 
 MOZ_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/thunderbird
 
 MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6}
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
-ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-beta,thunderbird-comm-release
+ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-release
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
-MAR_CHANNEL_ID=thunderbird-comm-beta
+MAR_CHANNEL_ID=thunderbird-comm-release
 MOZ_PROFILE_MIGRATOR=1
 MOZ_BINARY_EXTENSIONS=1
 MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES=1
 
 # Enable building ./signmar and running libmar signature tests
 MOZ_ENABLE_SIGNMAR=1
 
 MOZ_DEVTOOLS=all