Issue 2200 - PART I/II - Migrate to argparse

kick.py

 #!/usr/bin/env python
 # coding: utf-8
 
 import sys
 import getopt
 from run import resolveHostList, runCommand, createArgumentParser
 
 def parseOptions(args):
   description = 'Run provisioning on the given hosts or groups of hosts'
   parser = createArgumentParser(description=description)
@@ skipping 35 matching lines @@
   ])
   runCommand(user, 'puppetmaster.adblockplus.org', remoteCommand)
 
 def updateClient(user, host, mode):
   print 'Provisioning %s...' % host
   remoteCommand = 'sudo puppet agent%s' % mode
 
   # Have to ignore errors here, Puppet will return non-zero for successful runs
   runCommand(user, host, remoteCommand, ignore_errors=True)
 
-if __name__ == "__main__":

[Wladimir Palant, 2015/04/07 15:50:25]

Nit: We should use single quotes here as well if you are fixing it everywhere.

[mathias, 2015/04/07 15:56:22]

Done.

+if __name__ == '__main__':
   options = parseOptions(sys.argv[1:])
   needKicking = resolveHostList(options.hosts)
   if len(needKicking) == 0:
     print >>sys.stderr, 'No valid hosts or groups specified, nothing to do'
     sys.exit(0)
   updateMaster(options.user)
   for host in needKicking:
     updateClient(options.user, host, options.mode)