From 2862c23625e69ab4a38a13101c2ae9cd5ac71646 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Sat, 26 Mar 2011 15:01:47 +0000 Subject: [PATCH] daklib/changes.py: handle Dinstall::SuiteSuffix Signed-off-by: Ansgar Burchardt --- daklib/changes.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) 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 -- 2.39.5