Changeset 1063 for opsi/server/dass-opsi-tools

Timestamp:

Aug 15, 2012, 5:08:35 PM (12 years ago)

Author:

joergs

Message:

beautified

File:

• opsi/server/dass-opsi-tools/usr/bin/opsi-client (modified) (4 diffs)

opsi/server/dass-opsi-tools/usr/bin/opsi-client

@@ -10 +10 @@
 __version__ = "1.0"
 __email__ = "joerg.steffens@dass-it.de"
-
-# ATTENTION: 
-#   python-json-rpc has a problem with http-proxy support.
-#   In case of problems, make sure, the environment variables
-#   http_proxy / https_proxy
-#   are *not* set.
 
 # 
@@ -35 +29 @@
 from pprint import pprint
 
-UrlJsonRpc="https://<USERNAME>:<PASSWORD>@opsi:4447/rpc"
+UrlJsonRpc="https://<username>:<password>@opsi:4447/rpc"
+
+HelpEpilog="WARNING: python-json-rpc is known to have problems with HTTP proxies. In case of problems, make sure, the environment variables http_proxy and/or https_proxy are *not* set."
 
 class OpsiRpc:
+    
     
     ProductAttributesCopy = ['actionRequest','actionResult','installationStatus','packageVersion','productVersion']
@@ -131 +128 @@
 
 if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description='Command line tool for OPSI configuration.', epilog="WARNING: python-json-rpc is known to have problems with HTTP proxies. In case of problems, make sure, the environment variables http_proxy and/or https_proxy are *not* set." )
+    parser = argparse.ArgumentParser(description='Command line tool for OPSI configuration.', epilog=HelpEpilog )
+
+    parser.add_argument( '--url', required=True, help="OPSI Server JSON-RPC url, in following format: " + UrlJsonRpc )
+    
     parser.add_argument( '--debug', action='store_true', help="enable debugging output" )
     #parser.add_argument( '--verbose', type=bool, help="add debugging output" )
-    parser.add_argument( '--url', help="OPSI Server JSON-RPC url, normally https://<username>:<password>@<OPSI-SERVER>:4447/rpc" )
 
     subparsers = parser.add_subparsers(title='subcommands',
@@ -161 +160 @@
     args = parser.parse_args()
     
-    
-    urlJsonRpc = UrlJsonRpc
-    if args.url:
-        urlJsonRpc = args.url
-    
-    opsi=OpsiRpc( urlJsonRpc, args.debug )
+    opsi=OpsiRpc( args.url, args.debug )
     
     result = True