X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=katie.py;h=7842d2337be293667e6496aabe3f94f103f7d302;hb=21c929acd4a42145fc353c2e2507816022039e2a;hp=f952b34f088ea0b43e0acac5c5adb0fe6f01217b;hpb=00e76986e61d5dc2a84f62109423f0ef45d1c830;p=dak.git

diff --git a/katie.py b/katie.py
index f952b34f..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 <james@nocrew.org>
-# $Id: katie.py,v 1.53 2005-01-18 22:18:55 troup 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
 
@@ -813,7 +807,8 @@ distribution.""";
                             #
                             # And - we really should complain to the dorks who configured dak
                             self.reject("%s is mapped to, but not enhanced by %s - adding anyways" % (suite, addsuite), "Warning: ")
-                            self.pkg.changes["distribution"][addsuite] = 1
+                            self.pkg.changes.setdefault("propdistribution", {})
+                            self.pkg.changes["propdistribution"][addsuite] = 1
                             cansave = 1
                         elif not target_version:
                             # not targets_version is true when the package is NEW
@@ -822,17 +817,18 @@ distribution.""";
                             self.reject("Won't propogate NEW packages.")
                         elif apt_pkg.VersionCompare(new_version, add_version) < 0:
                             # propogation would be redundant. no need to reject though.
-                            #self.reject("ignoring versionconflict: %s: old version (%s) in %s <= new version (%s) targeted at %s." % (file, existent_version, suite, new_version, target_suite), "Warning: ");
-                            self.reject("foo", "Warning: ")
+                            self.reject("ignoring versionconflict: %s: old version (%s) in %s <= new version (%s) targeted at %s." % (file, existent_version, suite, new_version, target_suite), "Warning: ")
                             cansave = 1
                         elif apt_pkg.VersionCompare(new_version, add_version) > 0 and \
-                             apt_pkg.VersionCompare(add_version, target_version) == 0:
+                             apt_pkg.VersionCompare(add_version, target_version) >= 0:
                             # propogate!!
-                            self.pkg.changes["distribution"][addsuite] = 1
+                            self.reject("Propogating upload to %s" % (addsuite), "Warning: ")
+                            self.pkg.changes.setdefault("propdistribution", {})
+                            self.pkg.changes["propdistribution"][addsuite] = 1
                             cansave = 1
                 
                     if not cansave:
-                        self.reject("%s: old version (%s) in %s <= new version (%s) targeted at %s." % (file, existent_version, suite, new_version, target_suite));
+                        self.reject("%s: old version (%s) in %s <= new version (%s) targeted at %s." % (file, existent_version, suite, new_version, target_suite))
 
     ################################################################################