ajack 2004/02/10 11:20:44
Modified: python/gump/model module.py
Log:
Allow <module tag= to set tag, just like <cvs tag= does.
Revision Changes Path
1.31 +17 -7 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- module.py 5 Feb 2004 06:13:41 -0000 1.30
+++ module.py 10 Feb 2004 19:20:44 -0000 1.31
@@ -207,6 +207,9 @@
self.packaged = 0
self.updated = 0
+
+ # Extract settings
+ self.tag = xml.tag
# provide default elements when not defined in xml
def complete(self,workspace):
@@ -496,6 +499,13 @@
output.write(getIndent(indent)+'Module : ' + self.name + '\n')
NamedModelObject.dump(self, indent+1, output)
+ def hasTag(self):
+ if self.tag: return 1
+ return 0
+
+ def getTag(self):
+ return str(self.tag)
+
def getSourceDirectory(self):
return self.absSrcDir
@@ -595,8 +605,8 @@
cmd.addParameter('update')
cmd.addParameter('-P')
cmd.addParameter('-d')
- if self.cvs.hasTag():
- cmd.addParameter('-r',self.cvs.getTag(),' ')
+ if self.cvs.hasTag() or self.hasTag():
+ cmd.addParameter('-r',self.cvs.getTag() or self.getTag(),' ')
else:
cmd.addParameter('-A')
cmd.addParameter(self.getName())
@@ -606,8 +616,8 @@
# do a cvs checkout
cmd.addParameter('checkout')
cmd.addParameter('-P')
- if self.cvs.hasTag():
- cmd.addParameter('-r',self.cvs.getTag(),' ')
+ if self.cvs.hasTag() or self.hasTag():
+ cmd.addParameter('-r',self.cvs.getTag() or self.getTag(),' ')
if not self.cvs.hasModule() or \
not self.cvs.getModule() == self.getName():
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
