Backed out changeset 6d6366a2842e (bug 1317359) for test_checks_configure.py bustage
authorPhil Ringnalda <philringnalda@gmail.com>
Mon, 14 Nov 2016 21:36:44 -0800
changeset 322477 ec87fff279b6c9481ee9c18beeed3fcfc658c46d
parent 322476 6d6366a2842e26aabec2ad47b94e819de661ba05
child 322478 f6ae2c26b11a8f52195cfec6368c8da59c106dd9
push id21
push usermaklebus@msu.edu
push dateThu, 01 Dec 2016 06:22:08 +0000
bugs1317359
milestone53.0a1
backs out6d6366a2842e26aabec2ad47b94e819de661ba05
Backed out changeset 6d6366a2842e (bug 1317359) for test_checks_configure.py bustage CLOSED TREE
build/moz.configure/keyfiles.configure
--- a/build/moz.configure/keyfiles.configure
+++ b/build/moz.configure/keyfiles.configure
@@ -31,22 +31,18 @@ def keyfile(desc, help=None, callback=la
                 pass
         return no_key
 
     return keyfile
 
 
 @template
 def simple_keyfile(desc):
-    value = keyfile(desc)
-    set_config('MOZ_%s_KEY' % desc.upper().replace(' ', '_'), value)
-    # Only really required for MOZ_ADJUST_SDK_KEY currently still used in
-    # old-configure.
-    add_old_configure_assignment('MOZ_%s_KEY' % desc.upper().replace(' ', '_'),
-                                 value)
+    set_config('MOZ_%s_KEY' % desc.upper().replace(' ', '_'),
+               keyfile(desc))
 
 
 @template
 def id_and_secret_keyfile(desc):
     def id_and_secret(value):
         if value.startswith('no-') and value.endswith('-key'):
             id = value[:-3] + 'clientid'
             secret = value