diff --git a/LbRelease/python/LbRelease/SoftConfDB/AppImporter.py b/LbRelease/python/LbRelease/SoftConfDB/AppImporter.py index ba74b91e9d709e5125cfb56753766819770a2bf2..5103113d19d76ec9c65f843356c4a06e6f002f0b 100644 --- a/LbRelease/python/LbRelease/SoftConfDB/AppImporter.py +++ b/LbRelease/python/LbRelease/SoftConfDB/AppImporter.py @@ -80,14 +80,18 @@ class GitlabProject: def getToolchain(self): self.toolchainurl = self.getURL("toolchain.cmake") + self.log.debug("Getting: %s" %self.toolchainurl) response = urllib2.urlopen(self.toolchainurl) data = response.read() + self.log.debug("Got: %s" % self.toolchainurl) return data def getCMakeLists(self): self.cmakelistsurl = self.getURL("CMakeLists.txt") + self.log.debug("Getting: %s" % self.cmakelistsurl) response = urllib2.urlopen(self.cmakelistsurl) data = response.read() + self.log.debug("Got: %s" % self.cmakelistsurl) return data @@ -289,12 +293,22 @@ class AppImporter: else: createNode = True - if createNode: - self.log.warning("Creating project %s %s revision in SVN: %s" % (proj, ver, rev)) + # For LCG we check we don't have a LCGCMT node already... + if createNode and proj == "LCG": + tmplcgcmt = self.mConfDB.findVersion("LCGCMT", corver) + if len(tmplcgcmt) > 0: + self.log.warning("Found LCGCMT version %s instead of LCG" % corver) + node_parent = tmplcgcmt[0][0] + else: + self.log.warning("Creating project %s %s" % (proj, corver)) + node_parent = self.mConfDB.getOrCreatePV(proj, corver) + + if createNode and proj != "LCG": + self.log.warning("Creating project %s %s revision in SVN: %s" % (proj, corver, rev)) node_parent = self.mConfDB.getOrCreatePV(proj, corver) node_parent["Rev"] = rev # If releasing is needed! - if self.mAutorelease: + if self.mAutorelease and proj != "LCG" and proj != "LCGCMT": self.log.warning("Requesting release of %s %s" % (proj, corver)) self.mConfDB.setReleaseFlag(proj, corver)