Changeset 1848

Show
Ignore:
Timestamp:
10/19/04 23:37:57 (20 years ago)
Author:
jalet
Message:

Fixes recently introduced bug

Location:
pykota/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • pykota/trunk/bin/lprngpykota

    r1820 r1848  
    2424# 
    2525# $Log$ 
     26# Revision 1.9  2004/10/19 21:37:57  jalet 
     27# Fixes recently introduced bug 
     28# 
    2629# Revision 1.8  2004/10/13 20:51:27  jalet 
    2730# Made debugging levels be the same in cupspykota and lprngpykota. 
     
    158161            # update the quota for the current user on this printer  
    159162            self.printMoreInfo(user, printer, _("Job size : %i") % jobsize) 
    160             self.logdebug("Updating user %s's quota on printer %s" % (user.Name, printer.Name)) 
     163            self.printInfo(_("Updating user %s's quota on printer %s") % (user.Name, printer.Name)) 
    161164            jobprice = userpquota.increasePagesUsage(jobsize) 
    162165             
     
    193196            # in second pass, so all work is already done,  
    194197            # now we just have to exit successfully 
    195             self.printMoreInfo(user, printer, _("Software accounting already done in first pass. Ignoring.")) 
     198            self.printInfo(_("Software accounting already done in first pass. Ignoring.")) 
    196199        elif printer.LastJob.JobAction == "DENY" : 
    197200            # Hardware accounting method was used, but job 
    198201            # was rejected during first pass, so nothing to do 
    199             self.printMoreInfo(user, printer, _("Hardware accounting already done in first pass. Ignoring.")) 
     202            self.printInfo(_("Hardware accounting already done in first pass. Ignoring.")) 
    200203        else :     
    201204            # here if user and userpquota are both None 
  • pykota/trunk/NEWS

    r1847 r1848  
    2424    - 1.20alpha26 : 
    2525     
     26        - Fix for recently introduced bug in LPRng support. 
     27         
    2628        - Fix for incorrect locale setting when starting. 
    2729         
  • pykota/trunk/pykota/tool.py

    r1846 r1848  
    2222# 
    2323# $Log$ 
     24# Revision 1.131  2004/10/19 21:37:57  jalet 
     25# Fixes recently introduced bug 
     26# 
    2427# Revision 1.130  2004/10/19 15:21:48  jalet 
    2528# Fixed incorrect setting of the user's locale 
     
    11641167    def printMoreInfo(self, user, printer, message, level="info") :             
    11651168        """Prefixes the information printed with 'user@printer(jobid) =>'.""" 
    1166         self.printInfo("%s@%s(%s) => %s" % (user.Name, printer.Name, self.jobid, message), level) 
     1169        self.printInfo("%s@%s(%s) => %s" % (getattr(user, "Name", None), getattr(printer, "Name", None), self.jobid, message), level) 
    11671170         
    11681171    def extractInfoFromCupsOrLprng(self) :