#!/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
from daklib import utils
from daklib import database
from daklib import logging
+from daklib.regexes import re_comments
################################################################################
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
- maintainer_override = None
+ maintainer_override = ""
if type == "dsc":
split_line = line.split(None, 2)
if len(split_line) == 2:
(old_priority_id, old_section_id, old_maintainer_override, old_priority, old_section) = original[package]
if action == "add" or old_priority_id == priority_id and \
old_section_id == section_id and \
- ((old_maintainer_override == maintainer_override) or \
- (old_maintainer_override == "" and maintainer_override == None)):
+ old_maintainer_override == maintainer_override:
# If it's unchanged or we're in 'add only' mode, ignore it
c_skipped += 1
continue