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

Unified Diff: scripts/slave/bot_update.py

Issue 278943002: Use real revision mapping in bot_update module (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: oops Created 6 years, 7 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 | « no previous file | scripts/slave/recipe_modules/android/example.expected/basic.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/bot_update.py
diff --git a/scripts/slave/bot_update.py b/scripts/slave/bot_update.py
index 1df92f1b25a03ee57db1711f48a6da22a00cab65..b25b6a8702976dd23dfedeba5bd36b4a833e1e87 100755
--- a/scripts/slave/bot_update.py
+++ b/scripts/slave/bot_update.py
@@ -1038,8 +1038,13 @@ def parse_args():
parse.add_option('-f', '--force', action='store_true',
help='Bypass check to see if we want to be run. '
'Should ONLY be used locally.')
- parse.add_option('--revision_mapping')
- parse.add_option('--revision-mapping') # Backwards compatability.
+ parse.add_option('--revision_mapping',
+ help='{"path/to/repo/": "property_name"}')
+ parse.add_option('--revision_mapping_file',
+ help=('Same as revision_mapping, except its a path to a json'
+ ' file containing that format.'))
+ parse.add_option('--revision-mapping', # Backwards compatability.
+ help='DEPRECATED, use "revision_mapping" instead')
# TODO(hinoka): Support root@revision format.
parse.add_option('--revision',
help='Revision to check out. Can be an SVN revision number, '
@@ -1062,7 +1067,16 @@ def parse_args():
help='Output JSON information into a specified file')
- return parse.parse_args()
+ options, args = parse.parse_args()
+
+ if options.revision_mapping_file is not None:
+ if options.revision_mapping is not None:
+ print ('WARNING: revision_mapping_file was set at the same '
+ 'time as revision_mapping?')
+ with open(options.revision_mapping_file, 'r') as f:
+ options.revision_mapping = json.load(f)
+
+ return options, args
def main():
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/android/example.expected/basic.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698