Add --verbose option so the HTTP headers and XML request/response can be seen.

Also re-do the way modules are imported. I was attemping to have ^C handled
gracefully but the way I did it could mask other problems.

443987

1 files changed, 26 insertions, 16 deletions

diff --git a/ipa-admintools/ipa-modgroup b/ipa-admintools/ipa-modgroup
index a91d9a014..6905f5018 100644
--- a/ipa-admintools/ipa-modgroup
+++ b/ipa-admintools/ipa-modgroup
@@ -17,12 +17,33 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
+import sys
+try:
+    from optparse import OptionParser
+    import ipa
+    import ipa.group
+    import ipa.ipaclient as ipaclient
+    import ipa.config
+    import ipa.ipaerror
+
+    import xmlrpclib
+    import kerberos
+    import ldap
+    import errno
+except ImportError:
+    print >> sys.stderr, """\
+There was a problem importing one of the required Python modules. The
+error was:
+
+    %s
+""" % sys.exc_value
+    sys.exit(1)
 
 def usage():
     print "ipa-modgroup [-l|--list]"
-    print "ipa-modgroup [-a|--add] [-r|--remove] user group"
-    print "ipa-modgroup [-g|--groupadd] [-e|--groupdel] group group"
-    print "ipa-modgroup [-d|--desc description STRING] [--addattr attribute=value] [--delattr attribute] [--setattr attribute=value] group"
+    print "ipa-modgroup [-a|--add] [-r|--remove] [-v|--verbose] user group"
+    print "ipa-modgroup [-g|--groupadd] [-e|--groupdel] [-v|--verbose] group group"
+    print "ipa-modgroup [-d|--desc description STRING] [--addattr attribute=value] [--delattr attribute] [--setattr attribute=value] [-v|--verbose] group"
     sys.exit(1)
 
 def set_add_usage(which):
@@ -52,6 +73,8 @@ def parse_options():
                       help="List common attributes (this is not an exhaustive list)")
     parser.add_option("--usage", action="store_true",
                       help="Program usage")
+    parser.add_option("-v", "--verbose", action="store_true", dest="verbose",
+                      help="Verbose output of the XML-RPC connection")
 
     args = ipa.config.init_config(sys.argv)
     options, args = parser.parse_args(args)
@@ -183,19 +206,6 @@ def main():
     return 0
 
 try:
-    import sys
-    from optparse import OptionParser
-    import ipa
-    import ipa.group
-    import ipa.ipaclient as ipaclient
-    import ipa.config
-    import ipa.ipaerror
-
-    import xmlrpclib
-    import kerberos
-    import ldap
-    import errno
-
     if __name__ == "__main__":
         sys.exit(main())
 except SystemExit, e: