From: Anthony Towns Date: Fri, 25 Nov 2005 04:40:14 +0000 (+0000) Subject: katie.py: update to +bX binNMU versioning X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=c0065a491661ad115cb59ed84c47e638744b9823;p=dak.git katie.py: update to +bX binNMU versioning --- diff --git a/ChangeLog b/ChangeLog index 5dbb8929..83e88650 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * jennifer: If changed-by parsing fails, set variables to "" so REJECT works * jennifer: Re-enable .deb ar format checking + * katie.py: Convert to +bX binNMU special casing 2005-11-15 Anthony Towns diff --git a/katie.py b/katie.py index 569abf87..7842d233 100644 --- a/katie.py +++ b/katie.py @@ -2,7 +2,7 @@ # Utility functions for katie # Copyright (C) 2001, 2002, 2003, 2004, 2005 James Troup -# $Id: katie.py,v 1.54 2005-11-15 09:50:32 ajt Exp $ +# $Id: katie.py,v 1.55 2005-11-25 04:40:14 ajt Exp $ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,8 +31,7 @@ from types import *; re_isanum = re.compile (r"^\d+$"); re_default_answer = re.compile(r"\[(.*)\]"); re_fdnic = re.compile(r"\n\n"); -re_bin_only_nmu_of_mu = re.compile(r"\.\d+\.\d+$"); -re_bin_only_nmu_of_nmu = re.compile(r"\.\d+$"); +re_bin_only_nmu = re.compile(r"\+b\d+$"); ############################################################################### @@ -694,12 +693,7 @@ distribution."""; continue # Try (2) - orig_source_version = re_bin_only_nmu_of_mu.sub('', source_version) - if orig_source_version in ql: - continue - - # Try (3) - orig_source_version = re_bin_only_nmu_of_nmu.sub('', source_version) + orig_source_version = re_bin_only_nmu.sub('', source_version) if orig_source_version in ql: continue