Merge remote-tracking branch 'ansgar/control-suite-sort-by-version' into merge

* ansgar/control-suite-sort-by-version:
  control-suite: sort list of desired packages as intended

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --combined dak/control_suite.py
index 57e43da6ac0b77418c8b4745d4c900ef9c4c8728,54ccb0d5ab82a0878c89f0afc19f4dfadf89bcb6..236e36aa4cfbd005679f5f22f6f21a6de7d5d429
--- 1/dak/control_suite.py
--- 2/dak/control_suite.py
+++ b/dak/control_suite.py
@@@ -216,32 -216,31 +216,31 @@@ def set_suite(file, suite, session, bri
                               FROM binaries b, bin_associations ba, architecture a
                              WHERE ba.suite = :suiteid
                                AND ba.bin = b.id AND b.architecture = a.id""", {'suiteid': suite_id})
-     for i in q.fetchall():
-         key = " ".join(i[:3])
+     for i in q:
+         key = i[:3]
          current[key] = i[3]
  
-     q = session.execute("""SELECT s.source, s.version, sa.id
+     q = session.execute("""SELECT s.source, s.version, 'source', sa.id
                               FROM source s, src_associations sa
                              WHERE sa.suite = :suiteid
                                AND sa.source = s.id""", {'suiteid': suite_id})
-     for i in q.fetchall():
-         key = " ".join(i[:2]) + " source"
-         current[key] = i[2]
+     for i in q:
+         key = i[:3]
+         current[key] = i[3]
  
      # Build up a dictionary of what should be in the suite
-     desired = {}
+     desired = set()
      for line in lines:
          split_line = line.strip().split()
          if len(split_line) != 3:
              utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1]))
              continue
-         key = " ".join(split_line)
-         desired[key] = ""
+         desired.add(tuple(split_line))
  
      # Check to see which packages need added and add them
-     for key in sorted(desired.keys(), cmp=cmp_package_version):
-         if not current.has_key(key):
-             (package, version, architecture) = key.split()
+     for key in sorted(desired, cmp=cmp_package_version):
+         if key not in current:
+             (package, version, architecture) = key
              version_checks(package, architecture, suite.suite_name, version, session, force)
              pkid = get_id (package, version, architecture, session)
              if not pkid:
@@@ -252,18 -251,17 +251,17 @@@
              else:
                  session.execute("""INSERT INTO bin_associations (suite, bin)
                                          VALUES (:suiteid, :pkid)""", {'suiteid': suite_id, 'pkid': pkid})
-             Logger.log(["added", key, pkid])
+             Logger.log(["added", " ".join(key), pkid])
  
      # Check to see which packages need removed and remove them
-     for key in current.keys():
-         if not desired.has_key(key):
-             (package, version, architecture) = key.split()
-             pkid = current[key]
+     for key, pkid in current.iteritems():
+         if key not in desired:
+             (package, version, architecture) = key
              if architecture == "source":
                  session.execute("""DELETE FROM src_associations WHERE id = :pkid""", {'pkid': pkid})
              else:
                  session.execute("""DELETE FROM bin_associations WHERE id = :pkid""", {'pkid': pkid})
-             Logger.log(["removed", key, pkid])
+             Logger.log(["removed", " ".join(key), pkid])
  
      session.commit()
  
@@@ -396,7 -394,7 +394,7 @@@ def main ()
  
      try:
          file_list = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv);
 -    except SystemError, e:
 +    except SystemError as e:
          print "%s\n" % e
          usage(1)
      Options = cnf.SubTree("Control-Suite::Options")