From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 26 Mar 2011 15:06:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'ansgar/build-queues' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=63f95b9219d820a00bb4048a9b08b48c3ed09f4b;hp=4c02738f6c4961e603c8b4d2ac325e17eb1accee;p=dak.git

Merge remote-tracking branch 'ansgar/build-queues' into merge

* ansgar/build-queues:
  daklib/changes.py: handle Dinstall::SuiteSuffix

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

diff --git a/daklib/changes.py b/daklib/changes.py
index 54adb3b0..48da0e58 100644
--- a/daklib/changes.py
+++ b/daklib/changes.py
@@ -190,8 +190,13 @@ class Changes(object):
     def __get_file_from_pool(self, filename, entry, session):
         cnf = Config()
 
-        poolname = poolify(entry["source"], entry["component"])
-        l = get_location(cnf["Dir::Pool"], entry["component"], session=session)
+        if cnf.has_key("Dinstall::SuiteSuffix"):
+            component = cnf["Dinstall::SuiteSuffix"] + entry["component"]
+        else:
+            component = entry["component"]
+
+        poolname = poolify(entry["source"], component)
+        l = get_location(cnf["Dir::Pool"], component, session=session)
 
         found, poolfile = check_poolfile(os.path.join(poolname, filename),
                                          entry['size'],
@@ -200,14 +205,14 @@ class Changes(object):
                                          session=session)
 
         if found is None:
-            Logger.log(["E: Found multiple files for pool (%s) for %s" % (chg_fn, entry["component"])])
+            Logger.log(["E: Found multiple files for pool (%s) for %s" % (filename, component)])
             return None
         elif found is False and poolfile is not None:
-            Logger.log(["E: md5sum/size mismatch for %s in pool" % (chg_fn)])
+            Logger.log(["E: md5sum/size mismatch for %s in pool" % (filename)])
             return None
         else:
             if poolfile is None:
-                Logger.log(["E: Could not find %s in pool" % (chg_fn)])
+                Logger.log(["E: Could not find %s in pool" % (filename)])
                 return None
             else:
                 return poolfile