Merge branch 'psycopg2' into content_generation

[dak.git] / dak / check_overrides.py

diff --git a/dak/check_overrides.py b/dak/check_overrides.py
old mode 100644 (file)
new mode 100755 (executable)
index cdab644..ff01306
--- 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 logging
+from daklib import utils
 
 ################################################################################
 
@@ -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)" \