From 4782a4c5adc80f9de481f8b9c1d9ba77c05c3b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eray=20=C3=96zkural?= Date: Wed, 8 Mar 2006 13:18:05 +0000 Subject: [PATCH] * make output-dir work with build --- pisi/build.py | 10 +++++++--- pisi/operations.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pisi/build.py b/pisi/build.py index 7987d970..41e40484 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -640,13 +640,17 @@ class Builder: ctx.ui.info(_("Generating %s,") % ctx.const.metadata_xml) 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.release, 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: old_package_name = util.package_name(package.name, self.spec.source.version, diff --git a/pisi/operations.py b/pisi/operations.py index 4505b1ab..8572ca39 100644 --- a/pisi/operations.py +++ b/pisi/operations.py @@ -585,7 +585,7 @@ def emerge(A): ctx.ui.debug('A = %s' % str(A)) if len(A)==0: - ctx.ui.info(_('No packages to build.')) + ctx.ui.info(_('No packages to emerge.')) return if not ctx.config.get_option('ignore_dependency'):