Still more getopt -> argparse.

svn path=/trunk/; revision=5625

1 files changed, 31 insertions, 44 deletions

diff --git a/buildtools/build-ubuntu-ports.py b/buildtools/build-ubuntu-ports.py
index bb60af8a..8ee2efcc 100644
--- a/buildtools/build-ubuntu-ports.py
+++ b/buildtools/build-ubuntu-ports.py
@@ -1,56 +1,43 @@
-# Set up for an Ubuntu package build.
-#
-# This is a script because we need to set the changelog, and some day
-# we may need to do something about filtering specific files so we can
-# use the same skeleton for both Ubuntu and Debian builds without
-# requiring them to be identical.
-#
-# For now, though, this just copies the debian skeleton and creates a
-# changelog.
-#
 # $Id$
 #
-# Copyright (C) 2013  Internet Systems Consortium ("ISC")
-#
+# Copyright (C) 2014  Dragon Research Labs ("DRL")
+# Portions copyright (C) 2013  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 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
+# 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.
 
+"""
+Set up for a Debian or Ubuntu package build.
+
+This is a script because we need to set the changelog, and some day
+we may need to do something about filtering specific files so we can
+use the same skeleton for both Ubuntu and Debian builds without
+requiring them to be identical.
+
+For now, though, this just copies the debian skeleton and creates a
+changelog.
+"""
+
 import subprocess
-import getopt
+import argparse
 import shutil
 import sys
 import os
 
-def usage(status):
-    f = sys.stderr if status else sys.stdout
-    f.write("Usage: %s [--debuild] [--debi]\n" % sys.argv[0])
-    sys.exit(status)
-
-debuild = False
-debi    = False
-
-try:
-    opts, argv = getopt.getopt(sys.argv[1:], "-bih?", ["debuild", "debi", "help"])
-except getopt.GetoptError:
-    usage(1)
-for o, a in opts:
-    if o in ("-h", "-?", "--help"):
-        usage(0)
-    elif o in ("-b", "--debuild"):
-        debuild = not debuild
-    elif o in ("-i", "--debi"):
-        debi = not debi
-if argv:
-    usage(1)
+parser = argparse.ArgumentParser(description = __doc__)
+parser.add_argument("-b", "--debuild", action = "store_true", help = "run debuild")
+parser.add_argument("-i", "--debi", action = "store_true", help = "run debi")
+args = parser.parse_args()
 
 version = "0." + subprocess.check_output(("svnversion", "-c")).strip().split(":")[-1]
 
@@ -72,8 +59,8 @@ subprocess.check_call(("dch", "--create", "--package", "rpki", "--newversion",
                                  TZ       = "UTC",
                                  DEBEMAIL = "APT Builder Robot <aptbot@rpki.net>"))
 
-if debuild or debi:
+if args.debuild or args.debi:
     subprocess.check_call(("debuild", "-us", "-uc"))
 
-if debi:
+if args.debi:
     subprocess.check_call(("sudo", "debi", "--with-depends"))