Make recipes.py run give better messages.

recipes.py

 #!/usr/bin/env python
 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Tool to interact with recipe repositories.
 
 This tool operates on the nearest ancestor directory containing an
 infra/config/recipes.cfg.
 """
@@ skipping 84 matching lines @@
     for key, val in properties.iteritems():
       try:
         properties[key] = json.loads(val)
       except (ValueError, SyntaxError):
         pass  # If a value couldn't be evaluated, keep the string version
     return properties
 
   def get_properties_from_file(filename):
     properties_file = sys.stdin if filename == '-' else open(filename)
     properties = json.load(properties_file)
+    if filename == '-':
+      properties_file.close()
     assert isinstance(properties, dict)
     return properties
 
   def get_properties_from_json(props):
     return json.loads(props)
 
   arg_properties = get_properties_from_args(args.props)
   assert len(filter(bool,
       [arg_properties, args.properties_file, args.properties])) <= 1, (
           'Only one source of properties is allowed')
   if args.properties:
     properties = get_properties_from_json(args.properties)
   elif args.properties_file:
     properties = get_properties_from_file(args.properties_file)
   else:
     properties = arg_properties
 
   properties['recipe'] = args.recipe
 
   os.environ['PYTHONUNBUFFERED'] = '1'
   os.environ['PYTHONIOENCODING'] = 'UTF-8'
 
   _, config_file = get_package_config(args)
-  universe = loader.UniverseView(
+  universe_view = loader.UniverseView(
       loader.RecipeUniverse(
           package_deps, config_file), package_deps.root_package)
 
   workdir = (args.workdir or
       os.path.join(os.path.dirname(os.path.realpath(__file__)), 'workdir'))
   logging.info('Using %s as work directory' % workdir)
   if not os.path.exists(workdir):
     os.makedirs(workdir)
 
   old_cwd = os.getcwd()
   os.chdir(workdir)
   stream_engine = stream.ProductStreamEngine(
       stream.StreamEngineInvariants(),
       stream.AnnotatorStreamEngine(sys.stdout, emit_timestamps=args.timestamps))
   with stream_engine:
     try:
       ret = recipe_run.run_steps(
           properties, stream_engine,
           step_runner.SubprocessStepRunner(stream_engine),
-          universe=universe)
+          universe_view=universe_view)
     finally:
       os.chdir(old_cwd)
 
     return handle_recipe_return(ret, args.output_result_json, stream_engine)
 
 
 def remote(args):
   from recipe_engine import remote
 
   return remote.main(args)
@@ skipping 332 matching lines @@
   ret = main()
   if not isinstance(ret, int):
     if ret is None:
       ret = 0
     else:
       print >> sys.stderr, ret
       ret = 1
   sys.stdout.flush()
   sys.stderr.flush()
   os._exit(ret)