- except KeyError:
- pass
-
- print "Processing %s%s..." % (osuite, originremark)
- # 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)
-
- for component in cnf.SubTree("Component").List():
+
+ print "Processing %s%s..." % (suite.suite_name, originremark)
+
+ # Get a list of all suites that use the override file of 'suite.suite_name' as
+ # well as the suite
+ ocodename = suite.codename
+ suiteids = [x.suite_id for x in session.query(Suite).filter(Suite.overridecodename == ocodename).all()]
+ if suite.suite_id not in suiteids:
+ suiteids.append(suite.suite_id)
+
+ if len(suiteids) < 1:
+ utils.fubar("Couldn't find id's of all suites: %s" % suiteids)
+
+ for component in session.query(Component).all():