X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcheck_overrides.py;h=523cdefe52f4e85dfd62369d4cd4066fffdf132b;hb=5f3c900ab8365aba1a7c1661b0f46addd848d7ad;hp=7c924649deaed4a716ea8b583b04f0507fe970e3;hpb=06d8add07fc0757695f04f71067202603aa6d5fc;p=dak.git diff --git a/dak/check_overrides.py b/dak/check_overrides.py index 7c924649..523cdefe 100755 --- a/dak/check_overrides.py +++ b/dak/check_overrides.py @@ -341,9 +341,9 @@ def main (): priorities[entry] = name if not Options["No-Action"]: - Logger = daklog.Logger(cnf, "check-overrides") + Logger = daklog.Logger("check-overrides") else: - Logger = daklog.Logger(cnf, "check-overrides", 1) + Logger = daklog.Logger("check-overrides", 1) for osuite in cnf.SubTree("Check-Overrides::OverrideSuites").List(): if "1" != cnf["Check-Overrides::OverrideSuites::%s::Process" % osuite]: @@ -372,9 +372,12 @@ def main (): for component in cnf.SubTree("Component").List(): # It is crucial for the dsc override creation based on binary # overrides that 'dsc' goes first - otypes = cnf.ValueList("OverrideType") - otypes.remove("dsc") - otypes = ["dsc"] + otypes + otypes = ['dsc'] + for ot in session.query(OverrideType): + if ot.overridetype == 'dsc': + continue + otypes.append(ot.overridetype) + for otype in otypes: print "Processing %s [%s - %s]" \ % (osuite, component, otype)