Changeset c324ad3 for fedd

Timestamp:

Dec 1, 2010 10:46:56 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

1f356d3

Parents:

dee164e

Message:

Mishandling attributes and add directory creation

File:

• fedd/access_to_abac.py (modified) (3 diffs)

fedd/access_to_abac.py

@@ -89 +89 @@
         if user == '<same>':
             if gu is not None:
-                project = gu 
+                user = gu 
             else:
                 raise parse_error("User cannot be decisively mapped: %s" % l)
@@ -95 +95 @@
         # Create a semi-mnemonic name for the destination credential (the one
         # that will be mapped to the local attributes
-        if project and user:
-            a = 'project_%s_user_%s' % (project, user)
-        elif project:
-            a = 'project_%s' % project
-        elif user:
-            a = 'user_%s' % user
+        if gp and gu:
+            a = 'project_%s_user_%s' % (gp, gu)
+        elif gp:
+            a = 'project_%s' % gp
+        elif gu:
+            a = 'user_%s' % gu
         else:
             raise parse_error("No mapping for %s/%s!?" % (gp, gu))
@@ -305 +305 @@
 
 if opts.dir:
+    if not os.access(opts.dir, os.F_OK):
+        try:
+            os.mkdir(opts.dir, 0700)
+        except EnvironmentError, e:
+            sys.exit("Cannot create %s: %s" % (e.filename, e.strerror))
     if not os.path.isdir(opts.dir):
         sys.exit('%s is not a directory' % opts.dir)