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/17 18:03:00 UTC
cvs commit: jakarta-gump/python/gump tools.py nag.py document.py conf.py
ajack 2003/10/17 09:03:00
Modified: python/gump tools.py nag.py document.py conf.py
Log:
1) rsync -v -v [just to peek]
2) more debug on Nick's servers nag failures
3) '/' on nag links, if needed.
4) List build dirs w/ missing outputs (w/ unique output names)
Revision Changes Path
1.6 +3 -0 jakarta-gump/python/gump/tools.py
Index: tools.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/tools.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tools.py 16 Oct 2003 20:22:04 -0000 1.5
+++ tools.py 17 Oct 2003 16:03:00 -0000 1.6
@@ -101,7 +101,10 @@
cmd=Cmd('rsync','rsync_'+name,dir.work)
cmd.addParameter('-r')
cmd.addParameter('-a')
+ cmd.addParameter('-v')
+ cmd.addParameter('-v')
cmd.addParameter('--delete')
+ cmd.addParameter('--stats')
cmd.addParameter(sourcedir)
cmd.addParameter(destdir)
1.17 +7 -5 jakarta-gump/python/gump/nag.py
Index: nag.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/nag.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nag.py 16 Oct 2003 20:07:42 -0000 1.16
+++ nag.py 17 Oct 2003 16:03:00 -0000 1.17
@@ -94,8 +94,9 @@
project=Project.list[pname]
try:
nagProject(workspace,context,module,mctxt,project,pctxt)
- except:
- log.error("Failed to send nag e-mail for project " + pname)
+ except Exception, details:
+ log.error("Failed to send nag e-mails for project " + pname\
+ + " : " + str(details))
else:
log.error("Unknown project " + pname)
@@ -138,15 +139,16 @@
mail(toaddrs,fromaddr,email,workspace.mailserver)
nags+=1
- except:
- log.error("Failed to send nag e-mail for project " + project.name)
+ except Exception, details:
+ log.error("Failed to send nag e-mail for project " + project.name \
+ + " : " + str(details))
log.error(content)
# Belt and braces (nag to us if not nag to them)
if not nags:
email=EmailMessage(workspace.prefix+': '+module.name+'/'+project.name+' '+stateName(pctxt.status),content)
toaddr=workspace.mailinglist
- fromaddr=workspace.mailinglist
+ fromaddr=workspace.email
# We send to a list, but a list of one is fine..
toaddrs=[ workspace.mailinglist ] # :TODO: toaddr -> to users...
1.76 +5 -2 jakarta-gump/python/gump/document.py
Index: document.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document.py,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- document.py 15 Oct 2003 21:51:07 -0000 1.75
+++ document.py 17 Oct 2003 16:03:00 -0000 1.76
@@ -825,7 +825,7 @@
endSectionXDoc(x)
startSectionXDoc(x,'Command Line')
- sourceXDoc(x,work.command.formatCommandLine())
+ sourceXDoc(x,'\t\n".join(work.command.formatCommandLine().split(' ')))
endSectionXDoc(x)
startSectionXDoc(x,'Output')
@@ -1136,7 +1136,10 @@
return os.path.join(wdir,wname+'.xml')
def getContextAbsoluteUrl(root,context):
- return root+getContextUrl(context,0);
+ url=root
+ if not url.endsWith('/'): url += '/'
+ url += getContextUrl(context,0)
+ return url
def getContextUrl(context,depth=1):
if isinstance(context,GumpContext):
1.24 +4 -4 jakarta-gump/python/gump/conf.py
Index: conf.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/conf.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- conf.py 16 Oct 2003 19:32:02 -0000 1.23
+++ conf.py 17 Oct 2003 16:03:00 -0000 1.24
@@ -99,7 +99,7 @@
logurl = 'http://cvs.apache.org/builds/gump/nightly/'
bannerimage = 'http://jakarta.apache.org/images/jakarta-logo.gif'
- email = 'gump@jakarta.apache.org'
+ email = 'gump@' + gumpfullhost
mailinglist = 'gump@jakarta.apache.org'
mailserver = 'mail.apache.org'
prefix = '[GUMPY@' + gumphost + ']'