ajack 2004/01/19 15:53:24
Modified: python/gump/model module.py
Log:
Fallback to repository URL if <jars doesn't specify a URL.
Revision Changes Path
1.27 +12 -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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- module.py 19 Jan 2004 23:44:22 -0000 1.26
+++ module.py 19 Jan 2004 23:53:24 -0000 1.27
@@ -170,6 +170,12 @@
elif self.repository.hasUrl():
self.url = self.repository.getUrl()
+ def getRootUrl(self):
+ url=self.repository.getUrl()
+ if self.hasUrl():
+ url+=self.getUrl()
+ return url
+
def hasUrl(self):
return (hasattr(self,'url') and self.url)
@@ -678,8 +684,8 @@
log.debug("Jars Update Module " + self.getName() + \
", Repository Name: " + str(self.repository.getName()))
-
- url=self.jars.getUrl()
+
+ url=self.jars.getRootUrl()
log.debug("Jars URL: [" + url + "] on Repository: " +
self.repository.getName())
@@ -690,8 +696,7 @@
'update_'+self.getName(), \
self.getWorkspace().cvsdir)
- if self.jars.hasUrl():
- cmd.addParameter(self.jars.getUrl())
+ cmd.addParameter(url)
#
# Be 'quiet' (but not silent) unless requested otherwise.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
