summaryrefslogtreecommitdiffstats
path: root/source-builder/sb/setbuilder.py
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2013-03-04 18:07:38 +1100
committerChris Johns <chrisj@rtems.org>2013-03-04 18:07:38 +1100
commit06834cfcf50e5a22167dd99ce20840fa385f3f51 (patch)
tree344460e8bdcf879ea9f93e273276004fadd418cf /source-builder/sb/setbuilder.py
parentUpdate ^C message to the user. (diff)
downloadrtems-source-builder-06834cfcf50e5a22167dd99ce20840fa385f3f51.tar.bz2
Build set reports are the package name and not the config name.
Diffstat (limited to 'source-builder/sb/setbuilder.py')
-rw-r--r--source-builder/sb/setbuilder.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/source-builder/sb/setbuilder.py b/source-builder/sb/setbuilder.py
index 1fbc9a0..d104bf1 100644
--- a/source-builder/sb/setbuilder.py
+++ b/source-builder/sb/setbuilder.py
@@ -27,6 +27,7 @@ import distutils.dir_util
import glob
import operator
import os
+import sys
try:
import build
@@ -37,10 +38,10 @@ try:
import path
import reports
except KeyboardInterrupt:
- print 'user terminated'
+ print 'abort: user terminated'
sys.exit(1)
except:
- print 'unknown application load error'
+ print 'error: unknown application load error'
sys.exit(1)
#
@@ -110,7 +111,7 @@ class buildset:
raise error.general('invalid report format: %s' % (format[1]))
buildroot = _build.config.abspath('%{buildroot}')
prefix = self.opts.expand('%{_prefix}', self.defaults)
- name = path.splitext(path.basename(_config))[0] + ext
+ name = _build.main_package().name() + ext
outpath = path.host(path.join(buildroot, prefix, 'rtems-source-builder'))
outname = path.host(path.join(outpath, name))
_notice(self.opts, 'reporting: %s -> %s' % (_config, name))
@@ -354,7 +355,7 @@ def run():
except error.exit, eerr:
pass
except KeyboardInterrupt:
- _notice(opts, 'user terminated')
+ _notice(opts, 'abort: user terminated')
sys.exit(1)
sys.exit(0)