From a23bb1272be08d5ee4d05bbfd45e20ec6a15b6dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= Date: Thu, 7 Oct 2010 12:23:07 +0000 Subject: [PATCH] build: Search old packages in {compiled,debug}_packages_dir too This is similar to the behaviour before the build number removal except that it does not search recursively. --- pisi/operations/build.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pisi/operations/build.py b/pisi/operations/build.py index 6d9e7204..38517d57 100644 --- a/pisi/operations/build.py +++ b/pisi/operations/build.py @@ -1059,12 +1059,17 @@ class Builder: os.chdir(c) + old_package_dirs = (ctx.config.compiled_packages_dir(), + ctx.config.debug_packages_dir(), + outdir or ".") + for update in self.spec.history[1:]: filename = self.package_filename(self.metadata.package, update) - path = util.join_path(outdir, filename) if outdir else filename - if os.path.exists(path): - self.old_packages.append(filename) + for package_dir in old_package_dirs: + path = util.join_path(package_dir, filename) + if os.path.exists(path): + self.old_packages.append(filename) self.set_state("buildpackages") ctx.ui.info(_("Done."))