X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontrol_overrides.py;h=730ce25222a57e58becc379cd3d0e30752d1ca78;hb=cd5b29ddfd8de263c085f494b9573d683913f6f3;hp=9ea1cd60c2bd813bafdb42e7d4df95facfa51203;hpb=381be2d32b282b8c547bb328834e587755e1a832;p=dak.git diff --git a/dak/control_overrides.py b/dak/control_overrides.py old mode 100644 new mode 100755 index 9ea1cd60..730ce252 --- 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 # 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