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/11/25 00:05:37 UTC
cvs commit: jakarta-gump/python/gump/test model.py updater.py
ajack 2003/11/24 15:05:37
Modified: python/gump engine.py
python/gump/model workspace.py
python/gump/test/resources/full1 svn_module1.xml
python/gump/test model.py updater.py
Log:
Various minor fixes.
Revision Changes Path
1.18 +3 -2 jakarta-gump/python/gump/engine.py
Index: engine.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/engine.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- engine.py 24 Nov 2003 18:32:19 -0000 1.17
+++ engine.py 24 Nov 2003 23:05:37 -0000 1.18
@@ -108,7 +108,7 @@
# Nag
# Provide RSS
#
- if gumpSet.isFull():
+ if run.getGumpSet().isFull():
# Update Statistics
self.updateStatistics(run)
@@ -127,7 +127,8 @@
rss(run)
# Return an exit code based off success
- if workspace.isSuccess():
+ # :TODO: Move onto run
+ if run.getWorkspace().isSuccess():
result = SUCCESS
else:
result = FAILED
1.13 +1 -1 jakarta-gump/python/gump/model/workspace.py
Index: workspace.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/workspace.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- workspace.py 24 Nov 2003 16:14:06 -0000 1.12
+++ workspace.py 24 Nov 2003 23:05:37 -0000 1.13
@@ -489,7 +489,7 @@
self.noRuper=1
self.addWarning('"ruper" command not found, no package downloads')
- if not self.checkExecutable('rsync','-version',0):
+ if not self.checkExecutable('rsync','-help',0):
self.noRSync=1
self.addWarning('"rsync" command not found, so attempting recursive copy "cp -R"')
1.2 +2 -2 jakarta-gump/python/gump/test/resources/full1/svn_module1.xml
Index: svn_module1.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/test/resources/full1/svn_module1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- svn_module1.xml 21 Nov 2003 19:04:10 -0000 1.1
+++ svn_module1.xml 24 Nov 2003 23:05:37 -0000 1.2
@@ -5,7 +5,7 @@
Java based build tool
</description>
- <svn repository="svn_repository1"/>
+ <svn repository="svn_repository1" dir='svndir'/>
<project name="svn_project1">
<package>org.apache.tools.ant</package>
@@ -13,7 +13,7 @@
<depend project="random"/>
<option project="random"/>
<home nested="dist"/>
- <jar name="lib/output.jar" id="output"/>
+ <jar name="lib/outputSVN.jar" id="outputSVN"/>
<license name="LICENSE"/>
<nag from="Gump Integration Build <dev@ant.apache.org>"
1.7 +2 -1 jakarta-gump/python/gump/test/model.py
Index: model.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/test/model.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- model.py 24 Nov 2003 01:45:16 -0000 1.6
+++ model.py 24 Nov 2003 23:05:37 -0000 1.7
@@ -157,7 +157,8 @@
self.assertTrue('Module has SVN', svnmodule1.hasSvn())
self.assertFalse('Module has NOT CVS', svnmodule1.hasCvs())
- self.assertNonZeroString('SVN URL',svnmodule1.svn.getUrl())
+ self.assertNonZeroString('SVN URL',svnmodule1.svn.getRootUrl())
+ self.assertTrue('SVN Dir',svnmodule1.svn.hasDir())
def testDependencyMapping(self):
1.3 +2 -2 jakarta-gump/python/gump/test/updater.py
Index: updater.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/test/updater.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- updater.py 23 Nov 2003 06:16:39 -0000 1.2
+++ updater.py 24 Nov 2003 23:05:37 -0000 1.3
@@ -97,7 +97,7 @@
(repo, url, cmd) = command=self.svnModule1.getUpdateCommand(0)
# Updates
- (repo, root, cmd) = command=self.module1.getUpdateCommand(1)
+ (repo, root, cmd) = command=self.module1.getUpdateCommand(0)
- (repo, url, cmd) = command=self.svnModule1.getUpdateCommand(1)
+ (repo, url, cmd) = command=self.svnModule1.getUpdateCommand(0)