1 files changed, 26 insertions, 29 deletions
diff --git a/rcynic/rpki-torrent.py b/rcynic/rpki-torrent.py
index 6068d642..9b97f298 100644
--- a/rcynic/rpki-torrent.py
+++ b/rcynic/rpki-torrent.py
@@ -1,22 +1,22 @@
 #!/usr/local/bin/python
 
-"""
-$Id$
-
-Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-"""
+# $Id$
+#
+# Copyright (C) 2013--2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2012  Internet Systems Consortium ("ISC")
+# 
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notices and this permission notice appear in all copies.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS" AND DRL AND ISC DISCLAIM ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL DRL OR
+# ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+# OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 import urllib2
 import httplib
@@ -37,7 +37,7 @@ import stat
 import time
 import errno
 import fcntl
-import getopt
+import argparse
 import smtplib
 import email.mime.text
 
@@ -82,20 +82,17 @@ def main():
       syslog_flags |= syslog.LOG_PERROR
     syslog.openlog("rpki-torrent", syslog_flags)
 
-    cfg_file = [os.path.join(dn, fn)
-                for fn in ("rcynic.conf", "rpki.conf")
-                for dn in ("/var/rcynic/etc", "/usr/local/etc", "/etc")]
-
-    opts, argv = getopt.getopt(sys.argv[1:], "c:h?", ["config=", "help"])
-    for o, a in opts:
-      if o in ("-h", "--help", "-?"):
-        raise UseTheSourceLuke
-      elif o in ("-c", "--config"):
-        cfg_file = a
+    parser = argparse.ArgumentParser(description = __doc__)
+    parser.add_argument("-c", "--config",
+                        help = "configuration file")
+    args = parser.parse_args()
 
     global cfg
     cfg = MyConfigParser()
-    cfg.read(cfg_file)
+    cfg.read(args.config or
+             [os.path.join(dn, fn)
+              for fn in ("rcynic.conf", "rpki.conf")
+              for dn in ("/var/rcynic/etc", "/usr/local/etc", "/etc")])
 
     if cfg.act_as_generator:
       if len(argv) == 1 and argv[0] == "generate":