Changeset e65150a for fedd/federation

Timestamp:

Dec 10, 2010 3:27:05 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

3fa4328

Parents:

b67fd22

Message:

Make common ops use fewer options. Refactor.

File:

• fedd/federation/authorizer.py (modified) (1 diff)

fedd/federation/authorizer.py

@@ -209 +209 @@
         if self.me is not None and abac_pem_type(self.me) == 'both':
             if self.save_dir:
-                self.key, self.me = abac_split_cert(self.me,
-                        keyfile="%s/key.pem" % self.save_dir, 
-                        certfile = "%s/cert.pem" % self.save_dir)
+                keyfile="%s/key.pem" % self.save_dir 
+                certfile = "%s/cert.pem" % self.save_dir
+
+                # Clear a spot for the new key and cert files.
+                for fn in (keyfile, certfile):
+                    if os.access(fn, os.F_OK):
+                        os.unlink(fn)
+
+                self.key, self.me = abac_split_cert(self.me, keyfile, certfile)
             else:
                 raise abac_authorizer.bad_cert_error("Combination " + \