added extra overrides for testing too

[dak.git] / katie

diff --git a/katie b/katie
index 4db6937c47a7a989f24999f86290b9a7ad0031e4..03c3298d722fe0cb5509b8fe6727f323695e48e2 100755 (executable)
--- a/katie
+++ b/katie
@@ -2,7 +2,7 @@
 
 # Installs Debian packaes
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: katie,v 1.48 2001-06-23 16:57:26 troup Exp $
+# $Id: katie,v 1.50 2001-06-24 23:17:43 troup 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
@@ -114,13 +114,13 @@ class nmu_p:
         if dsc_name == changes["maintainername"] and (changes["changedbyname"] == "" or changes["changedbyname"] == dsc_name):
             return 0;
         
-        if dsc.has_key("maintainers"):
-            maintainers = string.split(dsc["maintainers"], ",");
-            maintainernames = {};
-            for i in maintainers:
+        if dsc.has_key("uploaders"):
+            uploaders = string.split(dsc["uploaders"], ",");
+            uploadernames = {};
+            for i in uploaders:
                 (rfc822, name, email) = utils.fix_maintainer (string.strip(i));
-                maintainernames[name] = "";
-            if maintainernames.has_key(changes["changedbyname"]):
+                uploadernames[name] = "";
+            if uploadernames.has_key(changes["changedbyname"]):
                 return 0;
 
         # Some group maintained packages (e.g. Debian QA) are never NMU's
@@ -484,7 +484,7 @@ def check_files():
                 if changes["architecture"].has_key("source"):
                     source_version = files[file]["source version"];
                     if source_version != changes["version"]:
-                        reject_message = reject_message + "Rejected: source version (%s) for %s doesn't match changes version %s.\n" % (files[file]["sourceversion"], file, changes["version"]);
+                        reject_message = reject_message + "Rejected: source version (%s) for %s doesn't match changes version %s.\n" % (files[file]["source version"], file, changes["version"]);
                 else:
                     if not source_exists (files[file]["source package"], source_version):
                         reject_message = reject_message + "Rejected: no source found for %s %s (%s).\n" % (files[file]["source package"], source_version, file);
@@ -1332,7 +1332,7 @@ def main():
     Subst = {}
     Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"];
     Subst["__BUG_SERVER__"] = Cnf["Dinstall::BugServer"];
-    bcc = "X-Katie: $Revision: 1.48 $"
+    bcc = "X-Katie: $Revision: 1.50 $"
     if Cnf.has_key("Dinstall::Bcc"):
         Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]);
     else: