From aa4f8f66e0649b350cc77e6db2db6145d328bcc7 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Fri, 15 Mar 2013 15:26:51 +1100 Subject: [PATCH] Generate a better error message. Use the package name in the installing message. --- source-builder/sb/build.py | 2 ++ source-builder/sb/setbuilder.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source-builder/sb/build.py b/source-builder/sb/build.py index 7ab77cb..3c2d507 100644 --- a/source-builder/sb/build.py +++ b/source-builder/sb/build.py @@ -506,9 +506,11 @@ def run(args): del b except error.general, gerr: print gerr + print >> sys.stderr, 'Build FAILED' sys.exit(1) except error.internal, ierr: print ierr + print >> sys.stderr, 'Build FAILED' sys.exit(1) except error.exit, eerr: pass diff --git a/source-builder/sb/setbuilder.py b/source-builder/sb/setbuilder.py index 4477e7e..1e9dbe5 100644 --- a/source-builder/sb/setbuilder.py +++ b/source-builder/sb/setbuilder.py @@ -153,8 +153,7 @@ class buildset: if not self.opts.get_arg('--no-install'): dst = _build.config.expand('%{_prefix}') src = path.join(src, dst) - _notice(self.opts, 'installing: %s -> %s' % \ - (self.bset_pkg, path.host(dst))) + _notice(self.opts, 'installing: %s -> %s' % (_build.name(), path.host(dst))) if not self.opts.dry_run(): self.copy(src, dst) @@ -374,6 +373,7 @@ def run(): print 'dep[%d]: %s' % (c, d) except error.general, gerr: print gerr + print >> sys.stderr, 'Build FAILED' sys.exit(1) except error.internal, ierr: print ierr