X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcheck_overrides.py;h=e21b849a239e612f8b6e747aa02877a8ec96cd3b;hb=d758865e3e272e6bdb0d647622d36c4eb4692c5d;hp=cdab644935f67a866408da210f087360235dd87c;hpb=5b5c503cec9ba3947fab187cd6bc9ea8d9552368;p=dak.git

diff --git a/dak/check_overrides.py b/dak/check_overrides.py
old mode 100644
new mode 100755
index cdab6449..e21b849a
--- a/dak/check_overrides.py
+++ b/dak/check_overrides.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Cruft checker and hole filler for overrides
+""" Cruft checker and hole filler for overrides """
 # Copyright (C) 2000, 2001, 2002, 2004, 2006  James Troup <james@nocrew.org>
 # Copyright (C) 2005  Jeroen van Wolffelaar <jeroen@wolffelaar.nl>
 
@@ -50,9 +50,9 @@
 
 import pg, sys, os
 import apt_pkg
-import daklib.database as database
-import daklib.logging as logging
-import daklib.utils as utils
+from daklib import database
+from daklib import daklog
+from daklib import utils
 
 ################################################################################
 
@@ -291,9 +291,9 @@ def main ():
         priorities[i[0]] = i[1]
 
     if not Options["No-Action"]:
-        Logger = logging.Logger(Cnf, "check-overrides")
+        Logger = daklog.Logger(Cnf, "check-overrides")
     else:
-        Logger = logging.Logger(Cnf, "check-overrides", 1)
+        Logger = daklog.Logger(Cnf, "check-overrides", 1)
 
     gen_blacklist(Cnf["Dir::Queue::Accepted"])
 
@@ -314,10 +314,10 @@ def main ():
 
         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]
+        ocodename = Cnf["Suite::%s::codename" % osuite].lower()
         suites = []
         for suite in Cnf.SubTree("Suite").List():
-            if ocodename == Cnf["Suite::%s::OverrideCodeName" % suite]:
+            if ocodename == Cnf["Suite::%s::OverrideCodeName" % suite].lower():
                 suites.append(suite)
 
         q = projectB.query("SELECT id FROM suite WHERE suite_name in (%s)" \
@@ -331,8 +331,6 @@ def main ():
             utils.fubar("Couldn't find id's of all suites: %s" % suites)
 
         for component in Cnf.SubTree("Component").List():
-            if component == "mixed":
-                continue; # Ick
             # It is crucial for the dsc override creation based on binary
             # overrides that 'dsc' goes first
             otypes = Cnf.ValueList("OverrideType")