diff options
author | Rob Crittenden <rcritten@redhat.com> | 2008-04-24 10:25:30 -0400 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2008-04-25 10:35:05 -0400 |
commit | a3a749cf5ea27fe46f12d866b93f94623f698efd (patch) | |
tree | 29756a022f9ee691250cc71e2a06165b8938ab8b /ipa-admintools/ipa-passwd | |
parent | 5eeb01edc75e4461ccbace0a129d9dfc7f26647a (diff) | |
download | freeipa-a3a749cf5ea27fe46f12d866b93f94623f698efd.tar.gz freeipa-a3a749cf5ea27fe46f12d866b93f94623f698efd.tar.xz freeipa-a3a749cf5ea27fe46f12d866b93f94623f698efd.zip |
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
Diffstat (limited to 'ipa-admintools/ipa-passwd')
-rw-r--r-- | ipa-admintools/ipa-passwd | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/ipa-admintools/ipa-passwd b/ipa-admintools/ipa-passwd index 22cffca8..fc39b7f8 100644 --- a/ipa-admintools/ipa-passwd +++ b/ipa-admintools/ipa-passwd @@ -17,15 +17,38 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Tempal Place, Suite 330, Boston, MA 02111-1307 USA # +import sys +try: + from optparse import OptionParser + import ipa + import ipa.ipaclient as ipaclient + import ipa.config + + 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-passwd [user]" + print "ipa-passwd [-v|--verbose] [user]" sys.exit(1) def parse_options(): parser = OptionParser() 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) @@ -98,19 +121,6 @@ def main(): return 0 try: - import sys - from optparse import OptionParser - import ipa - import ipa.ipaclient as ipaclient - import ipa.config - - import xmlrpclib - import kerberos - import krbV - import ldap - import getpass - import errno - if __name__ == "__main__": sys.exit(main()) except SystemExit, e: |