[dak/master] make-maintainers

[Joerg Jaspert <joerg@debian.org>]

one more irritating way made a little more clear.
fixed the output so it actually works for -u

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
 dak/make_maintainers.py |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dak/make_maintainers.py b/dak/make_maintainers.py
index a7b576a..80e2215 100755
--- a/dak/make_maintainers.py
+++ b/dak/make_maintainers.py
@@ -156,10 +156,10 @@ def main():
             package = source[0]
             version = source[1]
             maintainer = fix_maintainer(source[2])
-            if not gen_uploaders:
-                key = package
-            else:
+            if gen_uploaders:
                 key = (package, maintainer)
+            else:
+                key = package
 
             if packages.has_key(key):
                 if packages[key]["priority"] <= suite_priority:
@@ -234,7 +234,8 @@ def main():
     package_keys.sort()
     if gen_uploaders:
         for (package, maintainer) in package_keys:
-            lhs = "~".join([package, packages[package]["version"]])
+            key = (package, maintainer)
+            lhs = "~".join([package, packages[key]["version"]])
             print "%-30s %s" % (lhs, maintainer)
     else:
         for package in package_keys:
-- 
1.6.5