Packaging updates
This commit is contained in:
parent
141be1410a
commit
d930779381
2 changed files with 7 additions and 3 deletions
|
@ -166,8 +166,11 @@ repositories = initRepositories()
|
||||||
|
|
||||||
for scm in repositories:
|
for scm in repositories:
|
||||||
for p in scanPackages(scm):
|
for p in scanPackages(scm):
|
||||||
p.scanSetXmlFiles(includePaths)
|
try:
|
||||||
packages[p.id] = p
|
p.scanSetXmlFiles(includePaths)
|
||||||
|
packages[p.id] = p
|
||||||
|
except:
|
||||||
|
print "Skipping SCM package due to exception:", p.path
|
||||||
|
|
||||||
if os.path.exists(existingCatalogPath):
|
if os.path.exists(existingCatalogPath):
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -106,7 +106,8 @@ class PackageData:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
simNode = node.getChild("sim")
|
simNode = node.getChild("sim")
|
||||||
if (simNode.getValue("exclude", False)):
|
# honour variosu exclusion flags
|
||||||
|
if (simNode.getValue("exclude-from-catalog", False) or simNode.getValue("exclude-from-gui", False)):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
primary = simNode.getValue("variant-of", None)
|
primary = simNode.getValue("variant-of", None)
|
||||||
|
|
Loading…
Add table
Reference in a new issue