1 files changed, 27 insertions, 17 deletions
diff --git a/ipa-admintools/ipa-adddelegation b/ipa-admintools/ipa-adddelegation
index bd55d053..a7748cc9 100644
--- a/ipa-admintools/ipa-adddelegation
+++ b/ipa-admintools/ipa-adddelegation
@@ -17,10 +17,34 @@
 # 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.user
+    import ipa.ipaclient as ipaclient
+    import ipa.config
+    import ipa.aci
+    import ipa.ipaadminutil as ipaadminutil
+    import ipa.ipautil as ipautil
+
+    import xmlrpclib
+    import kerberos
+    import krbV
+    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-adddelegation [-l|--list]"
-    print "ipa-adddelegation [-a|--attributes attr1,attr2,..,attrn] [-s|--source STRING] [-t|--target STRING] name"
+    print "ipa-adddelegation [-a|--attributes attr1,attr2,..,attrn] [-s|--source STRING] [-t|--target STRING] [-v|--verbose] name"
     sys.exit(1)
 
 def parse_options():
@@ -33,6 +57,8 @@ def parse_options():
                       help="The target group name")
     parser.add_option("-l", "--list", dest="list", action="store_true",
                       help="List common attributes (this is not an exhaustive list)")
+    parser.add_option("-v", "--verbose", action="store_true", dest="verbose",
+                      help="Verbose output of the XML-RPC connection")
     parser.add_option("--usage", action="store_true",
                       help="Program usage")
 
@@ -151,22 +177,6 @@ def main():
     return 0
 
 try:
-    import sys
-    from optparse import OptionParser
-    import ipa
-    import ipa.user
-    import ipa.ipaclient as ipaclient
-    import ipa.config
-    import ipa.aci
-    import ipa.ipaadminutil as ipaadminutil
-    import ipa.ipautil as ipautil
-
-    import xmlrpclib
-    import kerberos
-    import krbV
-    import ldap
-    import errno
-
     if __name__ == "__main__":
         sys.exit(main())
 except SystemExit, e: