Changeset 1665 for pykota/trunk/pykota

Timestamp:

08/06/04 15:45:51 (20 years ago)

Author:

jalet

Message:

Fixed french translation problem.
Fixed problem with group quotas and strict enforcement.

Location:

pykota/trunk/pykota

Files:

• accounters/software.py (modified) (2 diffs)
• tool.py (modified) (2 diffs)
• version.py (modified) (1 diff)

pykota/trunk/pykota/accounters/software.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.7  2004/08/06 13:45:51  jalet
+# Fixed french translation problem.
+# Fixed problem with group quotas and strict enforcement.
+#
 # Revision 1.6  2004/07/01 19:56:43  jalet
 # Better dispatching of error messages
@@ -86 +90 @@
             else :    
                 status = retcode
-            self.filter.printInfo(_("Software accounter %s exit code is %s") % (self.arguments, repr(retcode)))
+            self.filter.printInfo(_("Software accounter %s exit code is %s") % (self.arguments, str(status)))
         self.filter.logdebug("Software accounter %s said job is %s pages long." % (self.arguments, pagecount))
         return pagecount    

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.117  2004/08/06 13:45:51  jalet
+# Fixed french translation problem.
+# Fixed problem with group quotas and strict enforcement.
+#
 # Revision 1.116  2004/07/24 20:20:29  jalet
 # Unitialized variable
@@ -716 +720 @@
                 action = "WARN" # we can still print until account is 0
         else :
-            val = grouppquota.PageCounter
+            val = grouppquota.PageCounter or 0
             if enforcement == "STRICT" :
                 val += self.softwareJobSize

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.19_unofficial"
+__version__ = "1.20alpha1_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""