pld-builder.new: PLD_Builder/acl.py bin builders run script from cron, so i...

arekm arekm at pld-linux.org
Wed Oct 20 19:05:46 CEST 2010


Author: arekm                        Date: Wed Oct 20 17:05:46 2010 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
bin builders run script from cron, so it yells about 'acl.conf has changed' at every run. Avoid that. Tell us only when acl.conf has really been changed while script was running.

---- Files affected:
pld-builder.new/PLD_Builder:
   acl.py (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/acl.py
diff -u pld-builder.new/PLD_Builder/acl.py:1.27 pld-builder.new/PLD_Builder/acl.py:1.28
--- pld-builder.new/PLD_Builder/acl.py:1.27	Mon Jun  7 10:52:58 2010
+++ pld-builder.new/PLD_Builder/acl.py	Wed Oct 20 19:05:40 2010
@@ -87,7 +87,6 @@
 
 class ACL_Conf:
     def __init__(self):
-        self.acl_conf_mtime = 0
         self.reload()
 
     def try_reload(self):
@@ -95,11 +94,11 @@
         if mtime != self.acl_conf_mtime:
             log.notice("acl.conf has changed, reloading...")
             self.reload()
-            self.acl_conf_mtime = mtime
             return True
         return False
 
     def reload(self):
+        self.acl_conf_mtime = os.stat(path.acl_conf)[stat.ST_MTIME]
         self.current_user = None
         status.push("reading acl.conf")
         p = ConfigParser.ConfigParser()
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/acl.py?r1=1.27&r2=1.28&f=u



More information about the pld-cvs-commit mailing list