diff options
Diffstat (limited to 'ipa-admintools/ipa-addservice')
| -rw-r--r-- | ipa-admintools/ipa-addservice | 48 |
1 files changed, 29 insertions, 19 deletions
diff --git a/ipa-admintools/ipa-addservice b/ipa-admintools/ipa-addservice index 1702069d..67ec8343 100644 --- a/ipa-admintools/ipa-addservice +++ b/ipa-admintools/ipa-addservice @@ -17,9 +17,35 @@ # 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.ipavalidate as ipavalidate + import ipa.ipautil as ipautil + import ipa.config + + import base64 + + import xmlrpclib + import kerberos + import krbV + import ldap + import getpass + 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-addservice [--force] principal" + print "ipa-addservice [--force] [-v|--verbose] principal" sys.exit(1) def parse_options(): @@ -29,6 +55,8 @@ def parse_options(): help="Force a service principal name") 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) @@ -52,24 +80,6 @@ def main(): return 0 try: - import sys - from optparse import OptionParser - import ipa - import ipa.user - import ipa.ipaclient as ipaclient - import ipa.ipavalidate as ipavalidate - import ipa.ipautil as ipautil - import ipa.config - - import base64 - - import xmlrpclib - import kerberos - import krbV - import ldap - import getpass - import errno - if __name__ == "__main__": sys.exit(main()) except SystemExit, e: |