Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(269)

Unified Diff: recipes.py

Issue 1861203002: Make recipes.py run give better messages. (Closed) Base URL: https://chromium.googlesource.com/external/github.com/luci/recipes-py@master
Patch Set: Fix test, remove unneeded description. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « recipe_engine/run.py ('k') | unittests/errors_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: recipes.py
diff --git a/recipes.py b/recipes.py
index d78d4abf9bb7d119c6bccdadce671b049b6d95a1..19ac90849eb0759a4c6acc72eb57fe1267065f89 100755
--- a/recipes.py
+++ b/recipes.py
@@ -102,6 +102,8 @@ def run(package_deps, args):
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
@@ -125,7 +127,7 @@ def run(package_deps, args):
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)
@@ -145,7 +147,7 @@ def run(package_deps, args):
ret = recipe_run.run_steps(
properties, stream_engine,
step_runner.SubprocessStepRunner(stream_engine),
- universe=universe)
+ universe_view=universe_view)
finally:
os.chdir(old_cwd)
« no previous file with comments | « recipe_engine/run.py ('k') | unittests/errors_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698