Fix a typo for "--dry-run" in the usage message.

fetch.py

 #!/usr/bin/env python
 # Copyright (c) 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.
 
 """
 Tool to perform checkouts in one easy command line!
 
 Usage:
   fetch <recipe> [--property=value [--property2=value2 ...]]
@@ skipping 42 matching lines @@
     pass
 
   def init(self):
     pass
 
   def sync(self):
     pass
 
   def run(self, cmd, **kwargs):
     print 'Running: %s' % (' '.join(pipes.quote(x) for x in cmd))
-    if self.options.dryrun:
+    if self.options.dry_run:
       return 0
     return subprocess.check_call(cmd, **kwargs)
 
 
 class GclientCheckout(Checkout):
 
   def run_gclient(self, *cmd, **kwargs):
     if not spawn.find_executable('gclient'):
       cmd_prefix = (sys.executable, os.path.join(SCRIPT_PATH, 'gclient.py'))
     else:
@@ skipping 40 matching lines @@
 
     # Configure and do the gclient checkout.
     self.run_gclient('config', '--spec', self.spec['gclient_spec'])
     if self.options.nohooks:
       self.run_gclient('sync', '--nohooks')
     else:
       self.run_gclient('sync')
 
     # Configure git.
     wd = os.path.join(self.base, self.root)
-    if self.options.dryrun:
+    if self.options.dry_run:
       print 'cd %s' % wd
     self.run_git(
         'submodule', 'foreach',
         'git config -f $toplevel/.git/config submodule.$name.ignore all',
         cwd=wd)
     self.run_git('config', 'diff.ignoreSubmodules', 'all', cwd=wd)
 
 
 class GclientGitSvnCheckout(GclientGitCheckout, SvnCheckout):
 
@@ skipping 15 matching lines @@
         return 1
 
     super(GclientGitSvnCheckout, self).init()
 
     # Configure git-svn.
     for path, svn_spec in git_svn_dirs.iteritems():
       real_path = os.path.join(*path.split('/'))
       if real_path != self.root:
         real_path = os.path.join(self.root, real_path)
       wd = os.path.join(self.base, real_path)
-      if self.options.dryrun:
+      if self.options.dry_run:
         print 'cd %s' % wd
       self.run_git('svn', 'init', '--prefix=origin/', '-T',
                    svn_spec['svn_branch'], svn_spec['svn_url'], cwd=wd)
       self.run_git('config', '--replace', 'svn-remote.svn.fetch',
                    svn_spec['svn_branch'] + ':refs/remotes/origin/' +
                    svn_spec['svn_ref'], cwd=wd)
       self.run_git('svn', 'fetch', cwd=wd)
 
 
 
@@ skipping 25 matching lines @@
 """
 usage: %s [options] <recipe> [--property=value [--property2=value2 ...]]
 
 This script can be used to download the Chromium sources. See
 http://www.chromium.org/developers/how-tos/get-the-code
 for full usage instructions.
 
 Valid options:
    -h, --help, help   Print this message.
    --nohooks          Don't run hooks after checkout.
-   -n, --dryrun       Don't run commands, only print them.
+   -n, --dry-run      Don't run commands, only print them.
 """ % os.path.basename(sys.argv[0]))
   sys.exit(bool(msg))
 
 
 def handle_args(argv):
   """Gets the recipe name from the command line arguments."""
   if len(argv) <= 1:
     usage('Must specify a recipe.')
   if argv[1] in ('-h', '--help', 'help'):
     usage()
 
-  dryrun = False
+  dry_run = False
   nohooks = False
   while len(argv) >= 2:
     arg = argv[1]
     if not arg.startswith('-'):
       break
     argv.pop(1)
     if arg in ('-n', '--dry-run'):
-      dryrun = True
+      dry_run = True
     elif arg == '--nohooks':
       nohooks = True
     else:
       usage('Invalid option %s.' % arg)
 
   def looks_like_arg(arg):
     return arg.startswith('--') and arg.count('=') == 1
 
   bad_parms = [x for x in argv[2:] if not looks_like_arg(x)]
   if bad_parms:
     usage('Got bad arguments %s' % bad_parms)
 
   recipe = argv[1]
   props = argv[2:]
-  return optparse.Values({'dryrun':dryrun, 'nohooks':nohooks }), recipe, props
+  return optparse.Values({'dry_run':dry_run, 'nohooks':nohooks }), recipe, props

[wtc, 2014/02/12 06:00:08]

I am not sure about this change. I assume the single-quoted string should not be
'dry-run'.

[Dirk Pranke, 2014/02/12 21:08:04]

Yup, that's the right change. LGTM, thanks!

 
 
 def run_recipe_fetch(recipe, props, aliased=False):
   """Invoke a recipe's fetch method with the passed-through args
   and return its json output as a python object."""
   recipe_path = os.path.abspath(os.path.join(SCRIPT_PATH, 'recipes', recipe))
   if not os.path.exists(recipe_path + '.py'):
     print "Could not find a recipe for %s" % recipe
     sys.exit(1)
 
@@ skipping 38 matching lines @@
 
 
 def main():
   options, recipe, props = handle_args(sys.argv)
   spec, root = run_recipe_fetch(recipe, props)
   return run(options, spec, root)
 
 
 if __name__ == '__main__':
   sys.exit(main())