ajack 2003/11/24 10:42:08
Modified: python/gump/model module.py
python/gump/document forrest.py
Log:
Forgot to run unit tests...
Revision Changes Path
1.15 +4 -3 jakarta-gump/python/gump/model/module.py
Index: module.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/module.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- module.py 24 Nov 2003 18:32:19 -0000 1.14
+++ module.py 24 Nov 2003 18:42:08 -0000 1.15
@@ -618,7 +618,7 @@
#
# Be 'quiet' (but not silent) unless requested otherwise.
#
- if and not self.isDebug() \
+ if not self.isDebug() \
and not self.isVerbose() \
and not self.svn.isDebug() \
and not self.svn.isVerbose():
@@ -640,8 +640,9 @@
# If module name != SVN directory, tell SVN to put it into
# a directory named after our module
#
- if not self.svn.getDir() == self.getName():
- cmd.addParameter(self.getName())
+ if self.svn.hasDir():
+ if not self.svn.getDir() == self.getName():
+ cmd.addParameter(self.getName())
return (self.repository, url, cmd)
1.15 +3 -2 jakarta-gump/python/gump/document/forrest.py
Index: forrest.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document/forrest.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- forrest.py 24 Nov 2003 16:14:06 -0000 1.14
+++ forrest.py 24 Nov 2003 18:42:08 -0000 1.15
@@ -782,8 +782,9 @@
repoList.createEntry( "CVSROOT: ", module.cvs.getCvsRoot())
if module.hasSvn():
- if module.svn.hasUrl():
- repoList.createEntry( "SVN URL: ", module.svn.getUrl())
+ if module.svn.hasDir():
+ repoList.createEntry( "SVN Directory: ", module.svn.getDir())
+ repoList.createEntry( "SVN URL: ", module.svn.getRootUrl())
if module.hasJars():
if module.jars.hasUrl():
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
