################################################################################
-def gen_blacklist(dir):
- for entry in os.listdir(dir):
- entry = entry.split('_')[0]
- blacklist[entry] = 1
-
def process(osuite, affected_suites, originosuite, component, otype, session):
global Logger, Options, sections, priorities
else:
Logger = daklog.Logger(cnf, "check-overrides", 1)
- gen_blacklist(cnf["Dir::Queue::Accepted"])
-
for osuite in cnf.SubTree("Check-Overrides::OverrideSuites").List():
if "1" != cnf["Check-Overrides::OverrideSuites::%s::Process" % osuite]:
continue
pass
print "Processing %s%s..." % (osuite, originremark)
+ suiteobj = get_suite(osuite)
# Get a list of all suites that use the override file of 'osuite'
- ocodename = cnf["Suite::%s::codename" % osuite].lower()
- suites = []
- suiteids = []
- for suite in cnf.SubTree("Suite").List():
- if ocodename == cnf["Suite::%s::OverrideCodeName" % suite].lower():
- suites.append(suite)
- s = get_suite(suite.lower(), session)
- if s is not None:
- suiteids.append(s.suite_id)
-
- if len(suiteids) != len(suites) or len(suiteids) < 1:
- utils.fubar("Couldn't find id's of all suites: %s" % suites)
+ ocodename = suiteobj.codename
+ suiteids = [x.suite_id for x in session.query(Suite).filter(Suite.overridecodename == ocodename).all()]
+
+ if len(suiteids) < 1:
+ utils.fubar("Couldn't find id's of all suites: %s" % suiteids)
for component in cnf.SubTree("Component").List():
# It is crucial for the dsc override creation based on binary
otypes.remove("dsc")
otypes = ["dsc"] + otypes
for otype in otypes:
- print "Processing %s [%s - %s] using %s..." \
- % (osuite, component, otype, suites)
+ print "Processing %s [%s - %s]" \
+ % (osuite, component, otype)
sys.stdout.flush()
process(osuite, suiteids, originosuite, component, otype, session)