From 7bdd3fe987963f6e7b02eca604153eff04b010d8 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Sun, 22 Feb 2009 15:48:50 +0000 Subject: [PATCH] control-overrides: Simplify maintainer override handling Signed-off-by: Frank Lichtenheld --- dak/control_overrides.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dak/control_overrides.py b/dak/control_overrides.py index 730ce252..aaf3fc14 100755 --- a/dak/control_overrides.py +++ b/dak/control_overrides.py @@ -123,7 +123,7 @@ def process_file (file, suite, component, type, action): if line == "": continue - maintainer_override = None + maintainer_override = "" if type == "dsc": split_line = line.split(None, 2) if len(split_line) == 2: @@ -166,8 +166,7 @@ def process_file (file, suite, component, type, action): (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 -- 2.39.5