aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bot_update: make --output_json required in script invocation.

Browse Source 
It's already set by recipe, so this should have 0 difference in prod.

R=iannucci@chromium.org

Bug:
Change-Id: I1e1129b9748d6647e45eb26892c8e892019fe088
Reviewed-on: https://chromium-review.googlesource.com/769164
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
changes/64/769164/2
Andrii Shyshkalov 8 years ago committed by Commit Bot
parent 23b8214cec
commit 331a276b54
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File

6
recipes/recipe_modules/bot_update/resources/bot_update.py
Unescape Escape View File

@ -1003,7 +1003,7 @@ def parse_args():
help=('Deprecated.')) help=('Deprecated.'))
parse.add_option('--clobber', action='store_true', parse.add_option('--clobber', action='store_true',
help='Delete checkout first, always') help='Delete checkout first, always')
parse.add_option('--output_json', parse.add_option('--output_json', required=True,
help='Output JSON information into a specified file') help='Output JSON information into a specified file')
parse.add_option('--no_shallow', action='store_true', parse.add_option('--no_shallow', action='store_true',
help='Bypass disk detection and never shallow clone. ' help='Bypass disk detection and never shallow clone. '
@ -1085,8 +1085,6 @@ def prepare(options, git_slns, active):
step_text = '[%dGB/%dGB used (%d%%)]' % (used_disk_space_gb, step_text = '[%dGB/%dGB used (%d%%)]' % (used_disk_space_gb,
total_disk_space_gb, total_disk_space_gb,
percent_used) percent_used)
if not options.output_json:
print '@@@STEP_TEXT@%s@@@' % step_text
shallow = (total_disk_space < SHALLOW_CLONE_THRESHOLD shallow = (total_disk_space < SHALLOW_CLONE_THRESHOLD
and not options.no_shallow) and not options.no_shallow)
@ -1148,7 +1146,6 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow):
ensure_no_checkout(dir_names, options.cleanup_dir) ensure_no_checkout(dir_names, options.cleanup_dir)
gclient_output = ensure_checkout(**checkout_parameters) gclient_output = ensure_checkout(**checkout_parameters)
except PatchFailed as e: except PatchFailed as e:
if options.output_json:
# Tell recipes information such as root, got_revision, etc. # Tell recipes information such as root, got_revision, etc.
emit_json(options.output_json, emit_json(options.output_json,
did_run=True, did_run=True,
@ -1181,7 +1178,6 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow):
got_revisions = { 'got_revision': 'BOT_UPDATE_NO_REV_FOUND' } got_revisions = { 'got_revision': 'BOT_UPDATE_NO_REV_FOUND' }
#raise Exception('No got_revision(s) found in gclient output') #raise Exception('No got_revision(s) found in gclient output')
if options.output_json:
# Tell recipes information such as root, got_revision, etc. # Tell recipes information such as root, got_revision, etc.
emit_json(options.output_json, emit_json(options.output_json,
did_run=True, did_run=True,

Write Preview
Loading…
Cancel
Save