ajack 2003/10/20 16:58:37
Modified: python/gump model.py launcher.py context.py document.py
conf.py
Log:
1) Rev'd version [to gaurantee HTML generated by stuff w/ property fixes]
2) Mind doc changes
3) Triple check that Property fix got in ('cos last dotnot run didn't show it.)
Revision Changes Path
1.38 +4 -4 jakarta-gump/python/gump/model.py
Index: model.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- model.py 20 Oct 2003 19:12:08 -0000 1.37
+++ model.py 20 Oct 2003 23:58:37 -0000 1.38
@@ -409,7 +409,7 @@
elif not hasattr(property,'name') or not property['name']:
# :TODO: Reconsider later, but default to project name for now...
property['name']=depend.project
- log.warn('Unnamed property in depend for: ' + depend.project + ' on ' +
project.name)
+ log.warn('Unnamed property for ' + project.name + ' in depend on: ' +
depend.project )
# :TODO: AJ added this, no idea if it is right/needed.
if depend.id: property['ids']= depend.id
1.29 +4 -8 jakarta-gump/python/gump/launcher.py
Index: launcher.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/launcher.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- launcher.py 20 Oct 2003 19:17:03 -0000 1.28
+++ launcher.py 20 Oct 2003 23:58:37 -0000 1.29
@@ -90,6 +90,7 @@
def __init__(self,name,value=None,separator=' ',prefix=None):
#if not name:
# raise 'Unnamed Parameter'
+ if not name: log.error('Unnamed Parameter')
self.name=name
self.value=value
self.separator=separator
@@ -254,17 +255,12 @@
return overview
- def tail(self,lines):
- tail = "---------------------------------------------\n"
-
-
+ def tail(self,lines):
if self.output:
from gump.tools import tailFileToString
- tail += tailFileToString(self.output,lines)
+ tail = tailFileToString(self.output,lines)
else:
- tail += "No output\n"
-
- tail += "---------------------------------------------\n"
+ tail = "No output\n"
return tail
1.25 +2 -0 jakarta-gump/python/gump/context.py
Index: context.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/context.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- context.py 19 Oct 2003 17:46:36 -0000 1.24
+++ context.py 20 Oct 2003 23:58:37 -0000 1.25
@@ -201,7 +201,9 @@
overview=TimedWorkItem.overview(self)
overview += self.command.overview()
if self.result:
+ overview += "---------------------------------------------\n"
overview+=self.result.tail(lines)
+ overview += "---------------------------------------------\n"
return overview
def tail(self,lines=50):
1.89 +0 -1 jakarta-gump/python/gump/document.py
Index: document.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document.py,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- document.py 20 Oct 2003 04:34:29 -0000 1.88
+++ document.py 20 Oct 2003 23:58:37 -0000 1.89
@@ -893,7 +893,6 @@
if line: line+=' '
line+=part
if line:
- commandLine += '\n '
commandLine += line
#
1.30 +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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- conf.py 20 Oct 2003 18:20:34 -0000 1.29
+++ conf.py 20 Oct 2003 23:58:37 -0000 1.30
@@ -110,7 +110,7 @@
class setting:
"""Configuration of hardcoded settings"""
- version="2.0.1-alpha-0005"
+ version="2.0.1-alpha-0006"
# :TODO: Add "minimum checks later..."
ws_version="0.4"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
