make-secnet-sites: Provide --debug and debugrepr

Useful for debugging.  So far our only caller helps with debugging the
argument parser itself.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/README.make-secnet-sites b/README.make-secnet-sites
index 43816ce9e850bd95e14821546153fa504c58cc51..0545c4bd293fd3d8477d45c795efc97ed94e84d9 100644 (file)
--- a/README.make-secnet-sites
+++ b/README.make-secnet-sites
@@ -34,6 +34,13 @@ USAGE
        produce Secnet configuration.
 
 
+OPTIONS
+
+       --debug | -D
+
+               Increase amount of debugging output.
+
+
 INPUT SYNTAX
 
        The input files have a simple line-based syntax.  Blank lines,

diff --git a/make-secnet-sites b/make-secnet-sites
index b666351e9e05917f62367bb2048012bbf7336b05..1dee0b3cf8ba7b40dce7c899c9ce55c9f10bfb2e 100755 (executable)
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -85,6 +85,10 @@ if version_info.major == 2:  # for python2
 
 max={'rsa_bits':8200,'name':33,'dh_bits':8200}
 
+def debugrepr(*args):
+       if debug_level > 0:
+               print(repr(args), file=sys.stderr)
+
 class Tainted:
        def __init__(self,s,tline=None,tfile=None):
                self._s=s
@@ -229,6 +233,7 @@ def parse_args():
        global of
        global prefix
        global key_prefix
+       global debug_level
 
        ap = argparse.ArgumentParser(description='process secnet sites files')
        ap.add_argument('--userv', '-u', action='store_true',
@@ -238,9 +243,11 @@ def parse_args():
                 help='prefix conf file key names derived from sites data')
        ap.add_argument('--prefix', '-P', nargs=1,
                        help='set prefix')
+       ap.add_argument('--debug', '-D', action='count', default=0)
        ap.add_argument('arg',nargs=argparse.REMAINDER)
        av = ap.parse_args()
-       #print(repr(av), file=sys.stderr)
+       debug_level = av.debug
+       debugrepr('av',av)
        service = 1 if av.userv else 0
        prefix = '' if av.prefix is None else av.prefix[0]
        key_prefix = av.conf_key_prefix