Debug packages may be moved to somewhere else by buildfarm
For build no calculation pisi has to look there also
This commit is contained in:
@@ -702,7 +702,7 @@ class Builder:
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
# find previous build in packages dir
|
# find previous build in packages dir
|
||||||
found = []
|
found = set()
|
||||||
def locate_old_package(old_package_fn):
|
def locate_old_package(old_package_fn):
|
||||||
if not old_package_fn.endswith(ctx.const.package_suffix) or \
|
if not old_package_fn.endswith(ctx.const.package_suffix) or \
|
||||||
old_package_fn.endswith(ctx.const.delta_package_suffix):
|
old_package_fn.endswith(ctx.const.delta_package_suffix):
|
||||||
@@ -718,13 +718,18 @@ class Builder:
|
|||||||
old_package_fn)
|
old_package_fn)
|
||||||
return
|
return
|
||||||
old_build = old_pkg.metadata.package.build
|
old_build = old_pkg.metadata.package.build
|
||||||
found.append( (old_package_fn, old_build) )
|
found.add( (old_package_fn, old_build) )
|
||||||
except Error:
|
except Error:
|
||||||
ctx.ui.warning('Package file %s may be corrupt. Skipping.' % old_package_fn)
|
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()):
|
def search_old_packages_in(paths):
|
||||||
for f in files:
|
for path in paths:
|
||||||
locate_old_package(pisi.util.join_path(root,f))
|
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')
|
outdir=ctx.get_option('output_dir')
|
||||||
if not outdir:
|
if not outdir:
|
||||||
|
|||||||
Reference in New Issue
Block a user