Changeset a0c2866

Timestamp:

Dec 10, 2010 9:19:57 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

ddf0903

Parents:

52b6ebc

Message:

Make sure there is an abac directory.

Location:

fedd

Files:

• fedd_create.py (modified) (1 diff)
• fedd_multiinfo.py (modified) (1 diff)
• fedd_multistatus.py (modified) (1 diff)
• fedd_new.py (modified) (1 diff)
• fedd_ns2topdl.py (modified) (1 diff)
• fedd_spewlog.py (modified) (1 diff)
• fedd_terminate.py (modified) (1 diff)
• federation/client_lib.py (modified) (1 diff)

fedd/fedd_create.py

@@ -157 +157 @@
 svcs = []
 # Option processing
-cert, fid, url = wrangle_standard_options(opts)
+try:
+    cert, fid, url = wrangle_standard_options(opts)
+except RuntimeError, e:
+    sys.exit("%s" %e)
 
 if opts.file:

fedd/fedd_multiinfo.py

@@ -25 +25 @@
 parser = exp_data_opts()
 (opts, args) = parser.parse_args()
-cert, fid, url = wrangle_standard_options(opts)
+try:
+    cert, fid, url = wrangle_standard_options(opts)
+except RuntimeError, e:
+    sys.exit("%s" %e)
 
 try:

fedd/fedd_multistatus.py

@@ -9 +9 @@
 parser = client_opts()
 (opts, args) = parser.parse_args()
-cert, fid, url = wrangle_standard_options(opts)
+try:
+    cert, fid, url = wrangle_standard_options(opts)
+except RuntimeError, e:
+    sys.exit("%s" %e)
 
 try:

fedd/fedd_new.py

@@ -25 +25 @@
 (opts, args) = parser.parse_args()
 
-cert, fid, url = wrangle_standard_options(opts)
 try:
+    cert, fid, url = wrangle_standard_options(opts)
     acerts = get_abac_certs(opts.abac_dir)
 except EnvironmentError, e:
     sys.exit('%s: %s' % (e.filename, e.strerror))
+except RuntimeError, e:
+    sys.exit("%s" %e)
 
 out_certfile = opts.out_certfile

fedd/fedd_ns2topdl.py

@@ -20 +20 @@
 (opts, args) = parser.parse_args()
 
-cert, fid, url = wrangle_standard_options(opts)
+try:
+    cert, fid, url = wrangle_standard_options(opts)
+except RuntimeError, e:
+    sys.exit("%s" %e)
 
 if opts.file:

fedd/fedd_spewlog.py

@@ -27 +27 @@
 (opts, args) = parser.parse_args()
 
-cert, fid, url = wrangle_standard_options(opts)
+try:
+    cert, fid, url = wrangle_standard_options(opts)
+except RuntimeError, e:
+    sys.exit("%s" %e)
 
 if opts.exp_name and opts.exp_certfile:

fedd/fedd_terminate.py

@@ -29 +29 @@
 parser = terminate_opts()
 (opts, args) = parser.parse_args()
-cert, fid, url = wrangle_standard_options(opts)
+
+try:
+    cert, fid, url = wrangle_standard_options(opts)
+except RuntimeError, e:
+    sys.exit("%s" %e)
 
 if opts.exp_name and opts.exp_certfile:

fedd/federation/client_lib.py

@@ -147 +147 @@
     else: url = default_url
 
+    if opts.abac_dir:
+        if not os.access(opts.abac_dir, os.F_OK):
+            raise RuntimeError("No ABAC directory: %s" % opts.abac_dir)
+        elif not os.path.isdir(opts.abac_dir):
+            raise RuntimeError("ABAC directory not a directory: %s" \
+                    % opts.abac_dir)
+        elif not os.access(opts.abac_dir, os.W_OK):
+            raise RuntimeError("Cannot write to ABAC directory: %s" \
+                    % opts.abac_dir)
+
+
 
     return (cert, fid, url)