ajack 2004/03/18 15:24:56
Modified: python/gump/output nag.py
Log:
1) Tinkered w/ preview (to show what would occur).
Used to "predict" how long a pattern might take (e.g. avalon-*)
Need to build this into the main engine, so we can actually follow the flow w/o
doing anything,
also go get results.xml to guestimate times.
2) Worked on nag overrides, I beleive they work now.
3) Made property based depends use inherit=NONE (not ALL)
4) Attempted to ma 'noclasspath' (and 'classpath' on property) work.
5) Some documentation logs/tweaks. No clue why LSD feels repeatedly one day stale.
Revision Changes Path
1.29 +11 -10 gump/python/gump/output/nag.py
Index: nag.py
===================================================================
RCS file: /home/cvs/gump/python/gump/output/nag.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- nag.py 15 Mar 2004 22:07:07 -0000 1.28
+++ nag.py 18 Mar 2004 23:24:56 -0000 1.29
@@ -108,12 +108,15 @@
log.error("Failed to send nag e-mails for project "
+ project.getName()\
+ " : " + str(details), exc_info=1)
+
+ # Workspace can override...
+ (wsTo, wsFrom) = self.workspace.getOverrides()
# Belt and braces (nag to us if not nag to them)
if self.hasUnwanted():
log.info('We have some unwanted\'s to send to list...')
- self.sendEmail(self.workspace.mailinglist,self.workspace.email, \
+ self.sendEmail(wsTo or self.workspace.mailinglist,wsFrom or
self.workspace.email, \
'BATCH: All dressed up, with nowhere to go...',\
self.getUnwantedContent())
@@ -128,7 +131,7 @@
# Belt and braces (nag to us if not nag to them)
if self.hasUnsent():
log.info('We have some unsented\'s to send to list...')
- self.sendEmail(self.workspace.mailinglist,self.workspace.email, \
+ self.sendEmail(wsTo or self.workspace.mailinglist,wsFrom or
self.workspace.email, \
'BATCH: Unable to send...',\
self.getUnsentContent())
@@ -250,22 +253,20 @@
# Send those e-mails
self.sendEmails(self.getAddressPairs(project),subject,content)
+ def g
+
def getAddressPairs(self, object):
nags=[]
- if self.workspace.xml.nag:
- #
- # Overrides
- #
- wstoaddr=getattr(self.workspace.xml.nag,'to','')
- wsfromaddr=getattr(self.workspace.xml.nag,'from','')
+ # Workspace can override...
+ (wsTo, wsFrom) = self.workspace.getOverrides()
for nagEntry in object.xml.nag:
#
# Determine where to send
#
- toaddr=wstoaddr or getattr(nagEntry,'to',self.workspace.mailinglist)
- fromaddr=wsfromaddr or getattr(nagEntry,'from',self.workspace.email)
+ toaddr=wsTo or getattr(nagEntry,'to',self.workspace.mailinglist)
+ fromaddr=wsFrom or getattr(nagEntry,'from',self.workspace.email)
# Somewhat bogus, but (I think) due to how the XML
# objects never admit to not having something
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
