Changeset 2c36179 for fedd/federation

Timestamp:

Jul 8, 2012 7:42:35 AM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

b15ecc6

Parents:

b931822

Message:

Correct updating

File:

• fedd/federation/authorizer.py (modified) (3 diffs)

fedd/federation/authorizer.py

@@ -201 +201 @@
     """
 
-    clean_attr_re = re.compile('[^A-Za-z0-9_]+')
+    clean_attr_re = re.compile('[^A-Za-z0-9_:]+')
     clean_prefix_attr_re = re.compile('^_+')
     cred_file_re = re.compile('.*\.der$')
@@ -657 +657 @@
     def update(self):
         rv = False
-        if update_dir is None: return True
+        if self.update_dir is None or not os.path.isdir(self.update_dir):
+            return True
         lf = None
         files = []
         try:
-            lf = open('%s/lock' % self.update_dir, 'r')
+            lf = open('%s/lock' % self.update_dir, 'w')
         except EnvironmentError, e:
             return rv
         try:
             fcntl.flock(lf, fcntl.LOCK_EX)
-            files = os.listdir(update_dir)
+            files = [os.path.join(self.update_dir, fn) \
+                    for fn in os.listdir(self.update_dir) \
+                        if fn != 'lock']
             rv = self.import_credentials(file_list=files)
             try: 
@@ -676 +679 @@
             rv = True
         finally:
-            fcntl.flock(fl, fcntl.LOCK_UN)
+            fcntl.flock(lf, fcntl.LOCK_UN)
         return rv