Backout changeset 37f3e53ede1f (bug 1257049) because of bustage.

configure.py

@@ -72,8 +72,9 @@ def config_status(config):
     if not config.get('BUILDING_JS') or config.get('JS_STANDALONE'):
         if not config.get('JS_STANDALONE'):
             os.environ['WRITE_MOZINFO'] = '1'
-        from mozbuild.config_status import config_status
-        return config_status(args=[], **sanitized_config)
+        # Until we have access to the virtualenv from this script, execute
+        # config.status externally, with the virtualenv python.
+        return subprocess.call([config['PYTHON'], 'config.status'])
     return 0
 
 

python/mozbuild/mozbuild/config_status.py

@@ -63,8 +63,7 @@
 
 
 def config_status(topobjdir='.', topsrcdir='.', defines=None,
-                  non_global_defines=None, substs=None, source=None,
-                  args=sys.argv[1:]):
+                  non_global_defines=None, substs=None, source=None):
     '''Main function, providing config.status functionality.
 
     Contrary to config.status, it doesn't use CONFIG_FILES or CONFIG_HEADERS
@@ -113,7 +112,7 @@ def config_status(topobjdir='.', topsrcdir='.', defines=None,
                         ' '.join(default_backends))
     parser.add_argument('--dry-run', action='store_true',
                         help='do everything except writing files out.')
-    options = parser.parse_args(args)
+    options = parser.parse_args()
 
     # Without -n, the current directory is meant to be the top object directory
     if not options.not_topobjdir: