You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by aj...@apache.org on 2003/10/15 22:40:03 UTC
cvs commit: jakarta-gump/python/gump model.py nag.py check.py document.py conf.py
ajack 2003/10/15 13:40:03
Modified: python/gump model.py nag.py check.py document.py conf.py
Log:
Nag to the gump mailing list (temporarily)
Revision Changes Path
1.27 +4 -3 jakarta-gump/python/gump/model.py
Index: model.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- model.py 14 Oct 2003 16:12:38 -0000 1.26
+++ model.py 15 Oct 2003 20:40:02 -0000 1.27
@@ -143,6 +143,7 @@
if not self.logurl: self.logurl = default.logurl
if not self.email: self.email = default.email
+ if not self.mailinglist: self.mailinglist = default.mailinglist
if not self.mailserver: self.mailserver = default.mailserver
if not self.prefix: self.prefix = default.prefix
if not self.signature: self.signature = default.signature
1.6 +13 -10 jakarta-gump/python/gump/nag.py
Index: nag.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/nag.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nag.py 14 Oct 2003 23:29:06 -0000 1.5
+++ nag.py 15 Oct 2003 20:40:02 -0000 1.6
@@ -98,7 +98,7 @@
""" Nag for the workspace """
content=getContext(context, "Workspace ... \n")
email=EmailMessage(workspace.prefix+': Gump Workspace Problem ',content)
- mail([ workspace.email ],workspace.email,email,workspace.mailserver)
+ mail([ workspace.mailinglist ],workspace.email,email,workspace.mailserver)
def nagProject(workspace,context,module,mctxt,project,pctxt):
""" Nag to a specific project's <nag entry """
@@ -116,9 +116,9 @@
# Form and send the e-mail...
#
email=EmailMessage(workspace.prefix+':'+module.name+'/'+project.name+' '+stateName(pctxt.status),content)
- toaddr=project.nag.toaddr or workspace.email
- fromaddr=project.nag.fromaddr or workspace.email
- toaddrs=[ toaddr or workspace.email ]
+ toaddr=project.nag.toaddr or workspace.mailinglist
+ fromaddr=project.nag.fromaddr or workspace.mailinglist
+ toaddrs=[ toaddr or workspace.mailinglist ]
mail(toaddrs,fromaddr,email,workspace.mailserver)
def getContent(context,message=''):
@@ -126,26 +126,29 @@
# Optional message
if message:
- content=message
+ content=message
#
# Add status (and reason)
#
- content += "Status: " + stateName(context.status)
+ content += "Status: " + stateName(context.status) + "\n"
if not context.reason == REASON_UNSET:
- content += "Reason: " + reasonString(context.reason)
+ content += "Reason: " + reasonString(context.reason) + "\n"
+
#
# Add an info/error/etc...
#
- for note in context.annotations:
- content += (' - %s - %s' % (levelName(note.level), note.text))
+ if context.annotations:
+ content += "\n\nAnnotations:\n"
+ for note in context.annotations:
+ content += (' - %s - %s\n' % (levelName(note.level), note.text))
#
# Work
#
if context.worklist:
- content+="\n"
+ content+="\n\nWork Items:\n"
for workitem in context.worklist:
content+=workitem.overview()+"\n"
1.26 +5 -3 jakarta-gump/python/gump/check.py
Index: check.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/check.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- check.py 13 Oct 2003 18:51:20 -0000 1.25
+++ check.py 15 Oct 2003 20:40:02 -0000 1.26
@@ -289,6 +289,7 @@
print " ***** WORKSPACE RESULT ***** "
print
if len(missing)>0:
+ context.addError("Some projects that were referenced are missing in the workspace.")
print
print " - ERROR - Some projects that were referenced are missing in the workspace. "
print " See the above messages for more detailed info."
@@ -296,6 +297,7 @@
print " - OK - All projects that are referenced are present in the workspace."
if len(optionalOnlyMissing)>0:
+ context.addWarning("Some projects that were referenced as optional are missing in the workspace.");
print
print " - WARNING - Some projects that were referenced as optional only are "
print " missing in the workspace. "
1.73 +8 -6 jakarta-gump/python/gump/document.py
Index: document.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document.py,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- document.py 14 Oct 2003 23:29:06 -0000 1.72
+++ document.py 15 Oct 2003 20:40:02 -0000 1.73
@@ -298,6 +298,7 @@
titledDataInTableXDoc(x,"Jars Repository : ", str(workspace.jardir))
titledDataInTableXDoc(x,"CVS Directory : ", str(workspace.cvsdir))
titledDataInTableXDoc(x,"Package Directory : ", str(workspace.pkgdir))
+ titledDataInTableXDoc(x,"List Address: ", str(workspace.mailinglist))
titledDataInTableXDoc(x,"Email Address: ", str(workspace.email))
titledDataInTableXDoc(x,"Email Server: ", str(workspace.mailserver))
titledDataInTableXDoc(x,"Prefix: ", str(workspace.prefix))
@@ -757,14 +758,14 @@
x=startXDoc(getWorkDocument(dir,work.command.name,work.type))
headerXDoc(x, workTypeName(work.type) + ' : ' + work.command.name)
startSectionXDoc(x,'Details')
- paragraphXDoc(x,"Status: " + stateName(work.status))
- paragraphXDoc(x,"Start Time" + time.strftime(setting.datetimeformat, \
+
+ startListXDoc(x)
+ addItemXDoc(x,"Status: ", stateName(work.status))
+ addItemXDoc(x,"Start Time: ", time.strftime(setting.datetimeformat, \
time.localtime(work.result.start_time)))
- paragraphXDoc(x,"End Time" + time.strftime(setting.datetimeformat, \
+ addItemXDoc(x,"End Time: ", time.strftime(setting.datetimeformat, \
time.localtime(work.result.end_time)))
- endSectionXDoc(x)
- startListXDoc(x)
addItemXDoc(x,"Command: ", work.command.name)
if work.command.cwd:
addItemXDoc(x,"Working Directory: ", work.command.cwd)
@@ -775,7 +776,8 @@
addItemXDoc(x,"Exit Code: ", str(work.result.exit_code))
endListXDoc(x)
-
+ endSectionXDoc(x)
+
if work.command.params:
startSectionXDoc(x,'Parameter')
x.write('<table><tr><th>Prefix</th><th>Name</th><th>Value</th></tr>')
1.22 +4 -3 jakarta-gump/python/gump/conf.py
Index: conf.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/conf.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- conf.py 14 Oct 2003 16:12:38 -0000 1.21
+++ conf.py 15 Oct 2003 20:40:02 -0000 1.22
@@ -100,6 +100,7 @@
bannerimage = 'http://jakarta.apache.org/images/jakarta-logo.gif'
email = 'gump@lists.apache.org'
+ mailinglist = 'gump@lists.apache.org'
mailserver = 'mail.apache.org'
prefix = '[GUMPY@' + gumphost + ']'
signature="\r\n--\r\nGump http://jakarta.apache.org/gump\n" \