Changeset 7555 for TI12-security/trunk/MyProxyClient

Timestamp:

29/09/10 16:33:29 (10 years ago)

Author:

pjkersha

Message:

New release 1.2.0:

• tested and added fixes to command line script 'myproxyclient'

File:

• TI12-security/trunk/MyProxyClient/myproxy/script.py (modified) (4 diffs)

TI12-security/trunk/MyProxyClient/myproxy/script.py

@@ -33 +33 @@
 
 from myproxy.client import MyProxyClient
+
 
 def make_optparser():
@@ -133 +134 @@
     logname = os.environ.get('LOGNAME')
 
-    command = argv[1]
+    nArgs = len(argv)
+    if nArgs < 2:
+        op.error('No command set')
+    else:
+        command = argv[1]
     
     # Catch example of just specifying --help or '-h'
@@ -139 +144 @@
         argl = argv[1:2]
         command = None
+        
+    elif command != 'logon':
+        op.error('Command %s not supported' % command)
+        
+    elif nArgs < 3:
+        op.error('No command options set')
+        
     else:
         argl = argv[2:]
-    options, args = op.parse_args(argl)
+        
+    options = op.parse_args(argl)[0]
 
     if options.outfile is None:
@@ -174 +187 @@
     myproxy = MyProxyClient(**client_props)
 
-    if command == 'logon':
-        do_logon(myproxy, options)
-    else:
-        op.error('Command %s not supported' % command)
+    do_logon(myproxy, options)