Changeset 66bb590 for fedd/init_abac_authorizer.py

Timestamp:

Dec 10, 2010 9:03:35 AM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

52b6ebc

Parents:

913dc7a (diff), 8d5394e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of tardis.deterlab.net:/var/local/git/fedd

File:

• fedd/init_abac_authorizer.py (modified) (1 diff)

fedd/init_abac_authorizer.py

@@ -5 +5 @@
 
 from optparse import OptionParser
-from federation.authorizer import abac_authorizer
+from federation.authorizer import abac_authorizer, file_expanding_opts
 
 class Parser(OptionParser):
     def __init__(self):
         OptionParser.__init__(self, usage='%prog [options]')
-        self.add_option('--cert', dest='cert', help='Identity certificate')
-        self.add_option('--key', dest='key', help='Identity key')
+        self.add_option('--cert', dest='cert', 
+                action='callback', callback=self.expand_file, type='str',
+                help='Identity certificate')
+        self.add_option('--key', dest='key',
+                action='callback', callback=self.expand_file, type='str',
+                help='Identity key')
         self.add_option('--policy', dest='policy', 
+                action='callback', callback=self.expand_file, type='str',
                 help='ABAC policy certificates')
-        self.add_option('--dir', dest='out_dir', help='directory to save into')
+        self.add_option('--dir', dest='out_dir',
+                action='callback', callback=self.expand_file, type='str',
+                help='directory to save into')
 
 parser = Parser()