* make output-dir work with build
This commit is contained in:
+6
-2
@@ -640,13 +640,17 @@ class Builder:
|
|||||||
ctx.ui.info(_("Generating %s,") % ctx.const.metadata_xml)
|
ctx.ui.info(_("Generating %s,") % ctx.const.metadata_xml)
|
||||||
build_number, old_build_number = self.gen_metadata_xml(package)
|
build_number, old_build_number = self.gen_metadata_xml(package)
|
||||||
|
|
||||||
ctx.ui.info(_("Creating PISI package %s.") % package.name)
|
|
||||||
|
|
||||||
name = util.package_name(package.name,
|
name = util.package_name(package.name,
|
||||||
self.spec.source.version,
|
self.spec.source.version,
|
||||||
self.spec.source.release,
|
self.spec.source.release,
|
||||||
self.metadata.package.build)
|
self.metadata.package.build)
|
||||||
|
|
||||||
|
outdir = ctx.get_option('output_dir')
|
||||||
|
if outdir:
|
||||||
|
name = pisi.util.join_path(outdir, name)
|
||||||
|
|
||||||
|
ctx.ui.info(_("Creating PISI package %s.") % name)
|
||||||
|
|
||||||
if old_build_number:
|
if old_build_number:
|
||||||
old_package_name = util.package_name(package.name,
|
old_package_name = util.package_name(package.name,
|
||||||
self.spec.source.version,
|
self.spec.source.version,
|
||||||
|
|||||||
+1
-1
@@ -585,7 +585,7 @@ def emerge(A):
|
|||||||
ctx.ui.debug('A = %s' % str(A))
|
ctx.ui.debug('A = %s' % str(A))
|
||||||
|
|
||||||
if len(A)==0:
|
if len(A)==0:
|
||||||
ctx.ui.info(_('No packages to build.'))
|
ctx.ui.info(_('No packages to emerge.'))
|
||||||
return
|
return
|
||||||
|
|
||||||
if not ctx.config.get_option('ignore_dependency'):
|
if not ctx.config.get_option('ignore_dependency'):
|
||||||
|
|||||||
Reference in New Issue
Block a user