Merge lp:~jameinel/hydrazine/arg-parsing into lp:hydrazine

[John A Meinel]

This fixes up some of the argument parsing.

Basically, there was code that said "if you have != 1 argument, abort", which doesn't work when you can supply stuff like --queued.

It then always used 'argv[1]' rather than using 'args[0]'. (So if you did 'feed-pqm --queued' it would parse the queued request, and then try and look at the --queued project in Launchpad.)

This should fix it up, and changes how it displays usage, etc. as well.

[Martin Pool (mbp)]

Thanks.

review: Approve

=== modified file 'feed-pqm'
--- feed-pqm	2010-06-23 01:33:23 +0000
+++ feed-pqm	2010-06-28 19:15:47 +0000
@@ -163,13 +163,18 @@
 
 
 def main(argv):
-    parser = optparse.OptionParser()
+    parser = optparse.OptionParser('%prog [options] PROJECT\n\n'
+        '  PROJECT is the launchpad project to inspect (eg bzr)')
     parser.add_option('--nomail', help="Do not send email commands", action="store_true", default=False)
     parser.add_option('--queued', help="Examine already queued proposals", action="store_true", default=False)
     opts, args = parser.parse_args()
+    if len(args) != 1:
+        parser.print_usage()
+        return 1
+    project = args[0]
     bzrlib_setup()
     launchpad = hydrazine.create_session()
-    project = launchpad.projects[argv[1]]
+    project = launchpad.projects[project]
     i = 0
     find_status = ['Approved']
     if opts.queued:
@@ -217,11 +222,5 @@
         print "No remaining merge proposals matching status %r?" % find_status
         return 0
 
-def usage():
-    print "feed-pqm <project-name>"
-
 if __name__ == '__main__':
-    if len(sys.argv) != 2:
-        usage()
-        sys.exit(1)
     sys.exit(main(sys.argv))