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 2004/05/19 22:48:34 UTC
cvs commit: gump/python/gump/update updater.py cvs.py
ajack 2004/05/19 13:48:34
Modified: python/gump/build Tag: MultiRunner maven.py
python/gump/update Tag: MultiRunner updater.py cvs.py
Log:
Test/Fix...
Revision Changes Path
No revision
No revision
1.1.2.5 +1 -1 gump/python/gump/build/Attic/maven.py
Index: maven.py
===================================================================
RCS file: /home/cvs/gump/python/gump/build/Attic/maven.py,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- maven.py 19 May 2004 20:14:15 -0000 1.1.2.4
+++ maven.py 19 May 2004 20:48:34 -0000 1.1.2.5
@@ -183,7 +183,7 @@
# Maven requires a build.properties to be generated...
if project.okToPerformWork():
try:
- propertiesFile=project.generateMavenProperties()
+ propertiesFile=self.generateMavenProperties(project)
project.addDebug('Maven Properties in: ' + propertiesFile)
try:
No revision
No revision
1.1.2.6 +2 -9 gump/python/gump/update/Attic/updater.py
Index: updater.py
===================================================================
RCS file: /home/cvs/gump/python/gump/update/Attic/updater.py,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- updater.py 19 May 2004 17:13:19 -0000 1.1.2.5
+++ updater.py 19 May 2004 20:48:34 -0000 1.1.2.6
@@ -128,7 +128,7 @@
ok = 0
if module.hasCvs():
- ok =self.cvs.updateModule(module)
+ ok=self.cvs.updateModule(module)
elif module.hasSvn():
ok=self.svn.updateModule(module)
elif module.hasJars():
@@ -171,14 +171,7 @@
module.changeState(STATE_SUCCESS)
# Were the contents of the repository modified?
- if modified:
- module.setModified(1)
- log.info('Update(s) received via CVS/SVN/Jars on #[' \
- + `module.getPosition()` + \
- '] : ' + module.getName())
-
- # Log of changes...
- if os.path.exists(changesFile):
+ if modified and os.path.exists(changesFile):
catFileToFileHolder(module, changesFile, FILE_TYPE_LOG)
except Exception, details:
1.1.2.4 +20 -6 gump/python/gump/update/Attic/cvs.py
Index: cvs.py
===================================================================
RCS file: /home/cvs/gump/python/gump/update/Attic/cvs.py,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- cvs.py 19 May 2004 16:01:58 -0000 1.1.2.3
+++ cvs.py 19 May 2004 20:48:34 -0000 1.1.2.4
@@ -100,6 +100,9 @@
def performUpdate(self,module,exists):
+ """
+ Update this module (checking out if needed)
+ """
# Get the Update Command
(repository, root, cmd ) = self.getCvsUpdateCommand(module, exists)
@@ -132,9 +135,16 @@
# Kinda bogus, but better than nowt (for now)
module.changeState(STATE_SUCCESS,REASON_UPDATE_FAILED)
else:
- module.changeState(STATE_SUCCESS)
-
-
+ module.changeState(STATE_SUCCESS)
+
+ # We run CVS as -q (quiet) so any output means
+ # updates occured...
+ if cmdResult.hasOutput():
+ module.setModified(1)
+ log.info('Update(s) received via CVS on #[' \
+ + `module.getPosition()` + \
+ '] : ' + module.getName())
+
def getCvsUpdateCommand(self,module,exists=0,nowork=0):
"""
@@ -143,6 +153,9 @@
"""
+ if nowork and not exists:
+ raise RuntimeException('Not coded for this combo.')
+
log.debug("CVS Update Module " + module.getName() + \
", Repository Name: " + str(module.repository.getName()))
@@ -155,9 +168,10 @@
#
prefix='update'
directory=module.getWorkspace().getSourceControlStagingDirectory()
+ if exists:
+ directory=module.getSourceControlStagingDirectory()
if nowork:
- prefix='status'
- directory=module.getSourceControlStagingDirectory()
+ prefix='status'
cmd=Cmd( 'cvs',
prefix+'_'+module.getName(),
@@ -210,7 +224,7 @@
cmd.addParameter('-r',tag,' ')
else:
cmd.addParameter('-A')
- cmd.addParameter(module.getName())
+ #cmd.addParameter(module.getName())
else:
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org