ajack       2003/10/15 15:04:37

  Modified:    python/gump nag.py
  Log:
  Don't exit if the nag 'from' address has characters we can't deal with...
  
  Revision  Changes    Path
  1.9       +14 -10    jakarta-gump/python/gump/nag.py
  
  Index: nag.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/nag.py,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- nag.py    15 Oct 2003 21:51:07 -0000      1.8
  +++ nag.py    15 Oct 2003 22:04:37 -0000      1.9
  @@ -119,18 +119,22 @@
       content+="\n\n\n"
           
       for nagEntry in project.nag:
  -        #
  -        # Form and send the e-mail...
  -        #
  -        email=EmailMessage(workspace.prefix+': '+module.name+'/'+project.name+' 
'+stateName(pctxt.status),content)
  -        toaddr=getattr(nagEntry,'to',workspace.mailinglist)
  -        fromaddr=getattr(nagEntry,'from',workspace.mailinglist)
  +        try:
  +            #
  +            # Form and send the e-mail...
  +            #
  +            email=EmailMessage(workspace.prefix+': '+module.name+'/'+project.name+' 
'+stateName(pctxt.status),content)
  +            toaddr=getattr(nagEntry,'to',workspace.mailinglist)
  +            fromaddr=getattr(nagEntry,'from',workspace.mailinglist)
           
  -        # We send to a list, but a list of one is fine..
  -        toaddrs=[ '[EMAIL PROTECTED]' ]
  +            # We send to a list, but a list of one is fine..
  +            toaddrs=[ '[EMAIL PROTECTED]' ]
           
  -        # Fire ...
  -        mail(toaddrs,fromaddr,email,workspace.mailserver) 
  +            # Fire ...
  +            mail(toaddrs,fromaddr,email,workspace.mailserver) 
  +        except:
  +            log.error("Failed to send nag e-mail for project " + pname)
  +            log.error(context)
       
   def getContent(workspace,context,message=''):
       content=''
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to