summaryrefslogtreecommitdiffstats
path: root/ipa-admintools/ipa-findservice
diff options
context:
space:
mode:
Diffstat (limited to 'ipa-admintools/ipa-findservice')
-rw-r--r--ipa-admintools/ipa-findservice36
1 files changed, 23 insertions, 13 deletions
diff --git a/ipa-admintools/ipa-findservice b/ipa-admintools/ipa-findservice
index fc4aa8b1..a5ae2be4 100644
--- a/ipa-admintools/ipa-findservice
+++ b/ipa-admintools/ipa-findservice
@@ -17,9 +17,29 @@
# 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.ipaclient as ipaclient
+ import ipa.config
+ import ipa.ipautil as ipautil
+ import ipa.ipaadminutil as ipaadminutil
+
+ import errno
+ import sys
+ import xmlrpclib
+ import kerberos
+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-findservice host"
+ print "ipa-findservice [-v|--verbose] host"
sys.exit()
def parse_options():
@@ -27,6 +47,8 @@ def parse_options():
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)
@@ -59,18 +81,6 @@ def main():
return 0
try:
- import sys
- from optparse import OptionParser
- import ipa.ipaclient as ipaclient
- import ipa.config
- import ipa.ipautil as ipautil
- import ipa.ipaadminutil as ipaadminutil
-
- import errno
- import sys
- import xmlrpclib
- import kerberos
-
if __name__ == "__main__":
sys.exit(main())
except SystemExit, e: