Changeset 5d7f1e8 for fedd

Timestamp:

Dec 3, 2010 9:37:31 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

a0e20ac

Parents:

3cec20c

Message:

Fix a bug where single string-valued local attributes were output as a comma-separated list of characters.

File:

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

fedd/access_to_abac.py

@@ -431 +431 @@
                     f = sys.stdout
                 for k, c in to_id.items():
+                    # Keys are either a single string or a tuple of them; join
+                    # the tuples into a comma-separated string.
+                    if isinstance(k, basestring): rhs = k
+                    else: rhs = join(k, ', ')
+
                     for a in set(["%s.%s" % (x.principal, x.attr) for x in c]):
-                        print >>f, "%s -> (%s)" % ( a, join(k, ', '))
+                        print >>f, "%s -> (%s)" % (a, rhs)
             except EnvironmentError, e:
                 sys.exit("Cannot open %s: %s" % (e.filename or '!?', 
@@ -449 +454 @@
                 a.save(auth_dir)
             except EnvironmentError, e:
-                sys.exit("Can't create or write %s: %s" % (e.filename, e.strerror))
+                sys.exit("Can't create or write %s: %s" % \
+                        (e.filename, e.strerror))
             except abac_authorizer.bad_cert_error, e:
                 sys.exit("Error creating authorizer: %s" % e)