Changeset 1848 for pykota

Timestamp:

10/19/04 23:37:57 (20 years ago)

Author:

jalet

Message:

Fixes recently introduced bug

Location:

pykota/trunk

Files:

• bin/lprngpykota (modified) (3 diffs)
• NEWS (modified) (1 diff)
• pykota/tool.py (modified) (2 diffs)

pykota/trunk/bin/lprngpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.9  2004/10/19 21:37:57  jalet
+# Fixes recently introduced bug
+#
 # Revision 1.8  2004/10/13 20:51:27  jalet
 # Made debugging levels be the same in cupspykota and lprngpykota.
@@ -158 +161 @@
             # update the quota for the current user on this printer 
             self.printMoreInfo(user, printer, _("Job size : %i") % jobsize)
-            self.logdebug("Updating user %s's quota on printer %s" % (user.Name, printer.Name))
+            self.printInfo(_("Updating user %s's quota on printer %s") % (user.Name, printer.Name))
             jobprice = userpquota.increasePagesUsage(jobsize)
             
@@ -193 +196 @@
             # in second pass, so all work is already done, 
             # now we just have to exit successfully
-            self.printMoreInfo(user, printer, _("Software accounting already done in first pass. Ignoring."))
+            self.printInfo(_("Software accounting already done in first pass. Ignoring."))
         elif printer.LastJob.JobAction == "DENY" :
             # Hardware accounting method was used, but job
             # was rejected during first pass, so nothing to do
-            self.printMoreInfo(user, printer, _("Hardware accounting already done in first pass. Ignoring."))
+            self.printInfo(_("Hardware accounting already done in first pass. Ignoring."))
         else :    
             # here if user and userpquota are both None

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.20alpha26 :
     
+        - Fix for recently introduced bug in LPRng support.
+        
         - Fix for incorrect locale setting when starting.
         

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.131  2004/10/19 21:37:57  jalet
+# Fixes recently introduced bug
+#
 # Revision 1.130  2004/10/19 15:21:48  jalet
 # Fixed incorrect setting of the user's locale
@@ -1164 +1167 @@
     def printMoreInfo(self, user, printer, message, level="info") :            
         """Prefixes the information printed with 'user@printer(jobid) =>'."""
-        self.printInfo("%s@%s(%s) => %s" % (user.Name, printer.Name, self.jobid, message), level)
+        self.printInfo("%s@%s(%s) => %s" % (getattr(user, "Name", None), getattr(printer, "Name", None), self.jobid, message), level)
         
     def extractInfoFromCupsOrLprng(self) :