From 2258433ff7ccc87b5c0eab87230804fcbdc42b94 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Mon, 3 Nov 2008 09:47:25 +0000 Subject: [PATCH] Debug packages may be moved to somewhere else by buildfarm For build no calculation pisi has to look there also --- pisi/operations/build.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pisi/operations/build.py b/pisi/operations/build.py index 16012441..bd149baa 100644 --- a/pisi/operations/build.py +++ b/pisi/operations/build.py @@ -702,7 +702,7 @@ class Builder: return False # find previous build in packages dir - found = [] + found = set() def locate_old_package(old_package_fn): if not old_package_fn.endswith(ctx.const.package_suffix) or \ old_package_fn.endswith(ctx.const.delta_package_suffix): @@ -718,13 +718,18 @@ class Builder: old_package_fn) return old_build = old_pkg.metadata.package.build - found.append( (old_package_fn, old_build) ) + found.add( (old_package_fn, old_build) ) except Error: ctx.ui.warning('Package file %s may be corrupt. Skipping.' % old_package_fn) - for root, dirs, files in os.walk(ctx.config.compiled_packages_dir()): - for f in files: - locate_old_package(pisi.util.join_path(root,f)) + def search_old_packages_in(paths): + for path in paths: + for root, dirs, files in os.walk(path): + for f in files: + locate_old_package(pisi.util.join_path(root,f)) + + search_old_packages_in([ctx.config.compiled_packages_dir(), + ctx.config.debug_packages_dir()]) outdir=ctx.get_option('output_dir') if not outdir: