Even more getopt -> argparse.

svn path=/trunk/; revision=5627

1 files changed, 9 insertions, 19 deletions

diff --git a/rpkid/rpki/old_irdbd.py b/rpkid/rpki/old_irdbd.py
index e3c17b38..10796711 100644
--- a/rpkid/rpki/old_irdbd.py
+++ b/rpkid/rpki/old_irdbd.py
@@ -20,8 +20,6 @@
 """
 IR database daemon.
 
-Usage: python irdbd.py [ { -c | --config } configfile ] [ { -h | --help } ]
-
 This is the old (pre-Django) version of irdbd, still used by smoketest
 and perhaps still useful as a minimal example.  This does NOT work with
 the GUI, rpkic, or any of the other more recent tools.
@@ -30,7 +28,7 @@ the GUI, rpkic, or any of the other more recent tools.
 import sys
 import os
 import time
-import getopt
+import argparse
 import urlparse
 import rpki.http
 import rpki.config
@@ -199,24 +197,16 @@ class main(object):
     os.environ["TZ"] = "UTC"
     time.tzset()
 
-    cfg_file = None
-    use_syslog = True
-
-    opts, argv = getopt.getopt(sys.argv[1:], "c:dh?", ["config=", "debug", "help"])
-    for o, a in opts:
-      if o in ("-h", "--help", "-?"):
-        print __doc__
-        sys.exit(0)
-      if o in ("-c", "--config"):
-        cfg_file = a
-      elif o in ("-d", "--debug"):
-        use_syslog = False
-    if argv:
-      raise rpki.exceptions.CommandParseFailure, "Unexpected arguments %s" % argv
+    parser = argparse.ArgumentParser(description = __doc__)
+    parser.add_argument("-c", "--config",
+                        help = "override default location of configuration file")
+    parser.add_argument("-d", "--debug", action = "store_true",
+                        help = "enable debugging mode")
+    args = parser.parse_args()
 
-    rpki.log.init("irdbd", use_syslog = use_syslog)
+    rpki.log.init("irdbd", use_syslog = not args.debug)
 
-    self.cfg = rpki.config.parser(cfg_file, "irdbd")
+    self.cfg = rpki.config.parser(args.config, "irdbd")
 
     startup_msg = self.cfg.get("startup-message", "")
     if startup_msg: