ajack 2004/04/29 10:00:43
Modified: . gumpy.py
python/gump/utils launcher.py __init__.py
server lsd.xml
python/gump/document/forrest documenter.py
Log:
1) More descriptive when gumpy.lock exists.
2) Restore project details on all pages (just not full dep* unless verbose)
3) Tweaked LSD comment
4) Show ENV for command (in --text) to debug 'gmp build depot*'
... which seems to be merging two paths, or having one bogus one.
Revision Changes Path
1.26 +4 -2 gump/gumpy.py
Index: gumpy.py
===================================================================
RCS file: /home/cvs/gump/gumpy.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gumpy.py 24 Apr 2004 15:25:18 -0000 1.25
+++ gumpy.py 29 Apr 2004 17:00:42 -0000 1.26
@@ -135,6 +135,7 @@
def establishLock(lockFile):
failed=0
+ info=''
if 'posix'==os.name:
import fcntl
@@ -143,6 +144,7 @@
fcntl.flock(lock.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
except:
failed=1
+ ifo=', and is locked.'
else:
if os.path.exists(lockFile):
@@ -152,10 +154,10 @@
lock=open(lockFile,'w')
if failed:
- print """The lock file [%s] exists.
+ print """The lock file [%s] exists%s.
Either Gump is still running, or it terminated very abnormally.
Please resolve this (waiting or removing the lock file) before retrying.
- """ % lockFile
+ """ % (lockFile, info)
sys.exit(1)
# Leave a mark...
1.22 +3 -0 gump/python/gump/utils/launcher.py
Index: launcher.py
===================================================================
RCS file: /home/cvs/gump/python/gump/utils/launcher.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- launcher.py 22 Apr 2004 22:58:15 -0000 1.21
+++ launcher.py 29 Apr 2004 17:00:42 -0000 1.22
@@ -209,6 +209,9 @@
overview=indent+'Command Line: ' + self.formatCommandLine()+'\n'
if self.cwd:
overview += indent+'[Working Directory: ' + self.cwd + ']\n'
+ if self.env:
+ for envKey in self.env.keys():
+ overview += indent+envKey+' : '+self.env[envKey]
return overview
def dump(self,indent=''):
1.34 +6 -0 gump/python/gump/utils/__init__.py
Index: __init__.py
===================================================================
RCS file: /home/cvs/gump/python/gump/utils/__init__.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- __init__.py 28 Apr 2004 13:16:34 -0000 1.33
+++ __init__.py 29 Apr 2004 17:00:43 -0000 1.34
@@ -32,6 +32,12 @@
def gumpSafeName(name):
"""returns a file system safe name"""
+ #
+ # .html in a filename (e.g. x.html.xml) confuses forrest/cocoon.
+ #
+ name=name.replace('.','_')
+
+ #
return urllib.quote_plus(name)
###############################################################################
1.5 +1 -1 gump/server/lsd.xml
Index: lsd.xml
===================================================================
RCS file: /home/cvs/gump/server/lsd.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lsd.xml 13 Apr 2004 15:59:25 -0000 1.4
+++ lsd.xml 29 Apr 2004 17:00:43 -0000 1.5
@@ -20,5 +20,5 @@
<title>Leo Simmons (LSD)</title>
<url>http://lsd.student.utwente.nl/gump</url>
<site>http://lsd.student.utwente.nl/</site>
- <note>Primary, server which send notification e-mails.</note>
+ <note>Primary Gump (sends notification e-mails).</note>
</server>
1.19 +7 -10 gump/python/gump/document/forrest/documenter.py
Index: documenter.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/forrest/documenter.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- documenter.py 26 Apr 2004 16:13:57 -0000 1.18
+++ documenter.py 29 Apr 2004 17:00:43 -0000 1.19
@@ -1594,23 +1594,20 @@
self.documentWorkList(run,document,project,'Project-level Work')
- if project.isVerboseOrDebug():
- addnSection=document.createSection('Additional Details')
- addnPara=addnSection.createParagraph()
- addnPara.createLink(gumpSafeName(project.getName()) + '_details.html',
\
- 'For additional project details (including
dependencies) ...')
+ addnSection=document.createSection('Additional Details')
+ addnPara=addnSection.createParagraph()
+ addnPara.createLink(gumpSafeName('details.html', \
+ 'For additional project details (including
dependencies) ...')
document.serialize()
- if project.isVerboseOrDebug():
- self.documentProjectDetails(run,project,workspace,gumpSet)
+ self.documentProjectDetails(run,project,workspace,gumpSet)
def documentProjectDetails(self,run,project,workspace,gumpSet):
document=XDocDocument('Project Details : ' + project.getName(), \
self.resolver.getFile(project, \
- project.getName() + '_details', \
- '.xml'))
+ 'details', '.xml'))
# x.write('<p><strong>Project Config :</strong> <link
href=\'%s\'>XML</link></p>' \
# % (getModuleProjectRelativeUrl(modulename,project.name)) )
@@ -1674,7 +1671,7 @@
depens += self.documentDependenciesList(dependencySection, 'Project
Dependencies', \
project.getDirectDependencies(), 0, 0, project, gumpSet)
-
+
depees += self.documentDependenciesList(dependencySection, 'Project
Dependees', \
project.getDirectDependees(), 1, 0, project, gumpSet)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
