Dump only salient differences from env_dump.py.

build/env_dump.py

 #!/usr/bin/python
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script can either source a file and dump the enironment changes done by
 # it, or just simply dump the current environment as JSON into a file.
 
 import json
 import optparse
 import os
 import pipes
 import subprocess
 import sys
 
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option('-f', '--output-json',
                     help='File to dump the environment as JSON into.')
   parser.add_option(
       '-d', '--dump-mode', action='store_true',
-      help='Dump the environment to the file and exit immediately.')
+      help='Dump the environment to sys.stdout and exit immediately.')

[iannucci, 2013/09/18 00:55:37]

just 'stdout' in help string :)

 
   options, args = parser.parse_args()
   if not options.output_json:
     parser.error('Requires --output-json option.')

[iannucci, 2013/09/18 00:55:37]

we should move this error into the 'else' clause below

 
   if options.dump_mode:

[iannucci, 2013/09/18 00:55:37]

we should make it an error to pass options.output_json here

     if args:
       parser.error("Cannot specify args with --dump-mode")
-    with open(options.output_json, 'w') as f:
-      json.dump(dict(os.environ), f)
+    json.dump(dict(os.environ), sys.stdout)
   else:
     envsetup_cmd = ' '.join(map(pipes.quote, args))
     full_cmd = [
         'bash', '-c',
         '. %s; %s -d -f %s' % (envsetup_cmd, os.path.abspath(__file__),

[iannucci, 2013/09/18 00:55:37]

I don't think we need to pass -f any more, since it's ignored.

                                options.output_json)
     ]
-    ret = subprocess.call(full_cmd)
-    if ret:
-      sys.exit('Error running %s and dumping env' % envsetup_cmd)
+    try:
+      output = subprocess.check_output(full_cmd)
+    except Exception as e:
+      sys.exit('Error running % and dumping environment.' % envsetup_cmd)

[iannucci, 2013/09/18 00:55:37]

missing %s

+
+    env_diff = {}
+    new_env = json.loads(output)
+    for k, val in new_env.items():
+      if k == '_' or (k in os.environ and os.environ[k] == val):
+        continue
+      env_diff[k] = val
+    with open(options.output_json, 'w') as f:
+      json.dump(env_diff, f)
 
 
 if __name__ == '__main__':
   sys.exit(main())