Changeset dcffcc6

Timestamp:

Dec 15, 2010 10:37:21 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

990b746

Parents:

c092b7f

Message:

Fix --make_dir (renamed from --make-dir). Code moves had broken it.

File:

• fedd/fedd_to_abac.py (modified) (2 diffs)

fedd/fedd_to_abac.py

@@ -132 +132 @@
     else: sys.exit('Cannot read %s (key file)' % opts.key)
 
+if opts.make_authorizer:
+    creds_dir = mkdtemp()
+    delete_creds = True
+else:
+    creds_dir = opts.dir
+    delete_creds = False
+
+if opts.cert:
+    if os.access(opts.cert, os.R_OK):
+        if not key:
+            if abac_pem_type(opts.cert) == 'both':
+                key, cert = abac_split_cert(opts.cert)
+                delete_certs = True
+        else:
+            cert = opts.cert
+    else:
+        sys.exit('Cannot read %s (certificate file)' % opts.cert)
+
+if any([ x is None for x in (cert, opts.dir, key)]):
+    print >>sys.stderr, "Need output dir, certificate and key to make creds"
+    print >>sys.stderr, "Reverting to debug mode"
+    debug = True
+else:
+    debug = opts.debug
+
 if opts.dir:
     if opts.make_dir:
@@ -145 +170 @@
             sys.exit('%s is not writable' % opts.dir)
 
-if opts.make_authorizer:
-    creds_dir = mkdtemp()
-    delete_creds = True
-else:
-    creds_dir = opts.dir
-    delete_creds = False
-
-if opts.cert:
-    if os.access(opts.cert, os.R_OK):
-        if not key:
-            if abac_pem_type(opts.cert) == 'both':
-                key, cert = abac_split_cert(opts.cert)
-                delete_certs = True
-        else:
-            cert = opts.cert
-    else:
-        sys.exit('Cannot read %s (certificate file)' % opts.cert)
-
-if any([ x is None for x in (cert, opts.dir, key)]):
-    print >>sys.stderr, "Need output dir, certificate and key to make creds"
-    print >>sys.stderr, "Reverting to debug mode"
-    debug = True
-else:
-    debug = opts.debug
 
 try: