Merge branch 'psycopg2' into content_generation

[dak.git] / dak / control_overrides.py

diff --git a/dak/control_overrides.py b/dak/control_overrides.py
old mode 100644 (file)
new mode 100755 (executable)
index 9ea1cd6..730ce25
--- a/dak/control_overrides.py
+++ b/dak/control_overrides.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Bulk manipulation of the overrides
+""" Bulk manipulation of the overrides """
 # Copyright (C) 2000, 2001, 2002, 2003, 2006  James Troup <james@nocrew.org>
 
 # This program is free software; you can redistribute it and/or modify
@@ -51,9 +51,10 @@
 
 import pg, sys, time
 import apt_pkg
-import daklib.utils as utils
-import daklib.database as database
-import daklib.logging as logging
+from daklib import utils
+from daklib import database
+from daklib import logging
+from daklib.regexes import re_comments
 
 ################################################################################
 
@@ -118,7 +119,7 @@ def process_file (file, suite, component, type, action):
     start_time = time.time()
     projectB.query("BEGIN WORK")
     for line in file.readlines():
-        line = utils.re_comments.sub('', line).strip()
+        line = re_comments.sub('', line).strip()
         if line == "":
             continue