Changeset 1808 for pykota/trunk

Timestamp:

10/12/04 11:14:03 (20 years ago)

Author:

jalet

Message:

Ensures that warnpykota still test other quota entries for each user if
he has not been warned, even if limited by his account balance.

Files:

• pykota/trunk/bin/warnpykota (modified) (2 diffs)

pykota/trunk/bin/warnpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.35  2004/10/12 09:14:03  jalet
+# Ensures that warnpykota still test other quota entries for each user if
+# he has not been warned, even if limited by his account balance.
+#
 # Revision 1.34  2004/10/12 09:09:04  jalet
 # Now warnpykota warns users limited by balance only once per launch.
@@ -247 +251 @@
                        userpquota.PageCounter or userpquota.LifePageCounter or \
                        self.storage.getUserNbJobsFromHistory(user) :
-                        if (user.LimitBy.lower() != 'balance') or not alreadydone.get(user.Name) :
-                            self.warnUserPQuota(userpquota)
-                        alreadydone[user.Name] = 1
+                        done = alreadydone.get(user.Name)
+                        if (user.LimitBy.lower() != 'balance') or not done :
+                            action = self.warnUserPQuota(userpquota)
+                            if not done :
+                                alreadydone[user.Name] = (action in ('WARN', 'DENY'))
                      
 if __name__ == "__main__" :