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/09/28 17:05:44 UTC
cvs commit: jakarta-gump/python/gump launcher.py context.py document.py conf.py
ajack 2003/09/28 08:05:44
Modified: python/gump launcher.py context.py document.py conf.py
Log:
url/time/cvs documentation tweaks
Revision Changes Path
1.8 +1 -1 jakarta-gump/python/gump/launcher.py
Index: launcher.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/launcher.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- launcher.py 27 Sep 2003 14:36:18 -0000 1.7
+++ launcher.py 28 Sep 2003 15:05:43 -0000 1.8
@@ -360,7 +360,7 @@
end_time=time.time()
result.start_time=start_time
result.end_time=end_time
- result.elapsed=round(end_time-start_time,2)
+ result.elapsed=int(round(end_time-start_time,0))
# Restore environment.
if cmd.cwd: os.chdir(originalCWD)
1.13 +2 -2 jakarta-gump/python/gump/context.py
Index: context.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/context.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- context.py 27 Sep 2003 05:35:05 -0000 1.12
+++ context.py 28 Sep 2003 15:05:43 -0000 1.13
@@ -400,7 +400,7 @@
if self.subcontexts:
for (cname,ctxt) in self.subcontexts.iteritems():
elapsedSecs += ctxt.elapsedSecs()
- return round(elapsedSecs,2)
+ return int(round(elapsedSecs,0))
def addInfo(self,text):
self.addAnnotation(LEVEL_INFO, text)
@@ -648,7 +648,7 @@
self.debug=0
#
- self.startdatetime=time.strftime("%a, %d %b %Y %H:%M:%S (%Z)", \
+ self.startdatetime=time.strftime(setting.datetimeformat, \
time.localtime())
self.timezone=str(time.tzname)
1.46 +19 -8 jakarta-gump/python/gump/document.py
Index: document.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- document.py 27 Sep 2003 17:26:57 -0000 1.45
+++ document.py 28 Sep 2003 15:05:43 -0000 1.46
@@ -389,12 +389,14 @@
# Provide a description/link back to the module site.
startSectionXDoc(x,'Description')
description=str(module.description)
+ if not description.strip().endswith('.'):
+ description+='. '
if not description:
description='No description provided.'
- if str(module.url):
- description+=' For more information, see: ' + getLink(str(module.url))
+ if module.url:
+ description+=' For more information, see: ' + getLink(module.url)
else:
- description+=' No module URL provided.'
+ description+=' (No module URL provided).'
paragraphXDoc(x,description)
endSectionXDoc(x)
@@ -427,7 +429,11 @@
startListXDoc(x)
addItemXDoc(x,"Status: " + stateName(modulecontext.status))
if modulecontext.cause and not modulecontext==modulecontext.cause:
- addItemXDoc(x, "Root Cause: ", getTypedContextLink(modulecontext.cause))
+ addItemXDoc(x, "Root Cause: ", getTypedContextLink(modulecontext.cause))
+ if module.cvs.repository:
+ addItemXDoc(x, "CVS Repository: ", module.cvs.repository)
+ if module.cvs.module:
+ addItemXDoc(x, "CVS Module: ", module.cvs.module)
endListXDoc(x)
endSectionXDoc(x)
@@ -464,12 +470,14 @@
# Provide a description/link back to the module site.
startSectionXDoc(x,'Description')
description=str(project.description) or str(module.description)
+ if not description.strip().endswith('.'):
+ description+='. '
if not description:
description='No description provided.'
- if str(project.url):
- description+=' For more information, see: ' + getLink(str(project.url))
+ if project.url:
+ description+=' For more information, see: ' + getLink(project.url)
else:
- description='No project URL provided.'
+ description=' (No project URL provided.)'
paragraphXDoc(x,description)
endSectionXDoc(x)
@@ -559,7 +567,10 @@
x.write(' <td><link href=\'%s\'>%s</link></td>' % (getWorkRelativeUrl(work.type,work.command.name),work.command.name))
x.write(' <td>%s</td>' % (workTypeName(work.type)))
x.write(' <td>%s</td><td>%s</td><td>%s</td>' \
- % (stateName(work.status), str(work.result.start_time), secsToString(work.secs)))
+ % ( stateName(work.status), \
+ time.strftime(setting.datetimeformat, \
+ time.localtime(work.result.start_time)), \
+ secsToString(work.secs)))
x.write(' </tr>')
x.write(' </table>\n')
endSectionXDoc(x)
1.16 +5 -3 jakarta-gump/python/gump/conf.py
Index: conf.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/conf.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- conf.py 26 Sep 2003 20:35:21 -0000 1.15
+++ conf.py 28 Sep 2003 15:05:43 -0000 1.16
@@ -111,6 +111,8 @@
# :TODO: Add "minimum checks later..."
ws_version="0.4"
+ datetimeformat="%a, %d %b %Y %H:%M:%S (%Z)"
+
class switch:
"""Configuration of switches """
optimize=0 # Optimize (at risk to exact correctness) anywhere one can