rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Return after an error as a dry-run carries on.

Browse Source
This commit is contained in:
Chris Johns 2015-12-11 16:21:44 +11:00
parent e8ed687ec2
commit 0661e90610
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source-builder/sb/sources.py
View File

@ -50,6 +50,7 @@ def set(label, args, macros, error):
args = _args(args) args = _args(args)
if len(args) < 2: if len(args) < 2:
error('%%%s requires at least 2 arguments' % (label)) error('%%%s requires at least 2 arguments' % (label))
return
_map = '%s-%s' % (label, args[0]) _map = '%s-%s' % (label, args[0])
macros.create_map(_map) macros.create_map(_map)
key = _make_key(label, 0) key = _make_key(label, 0)
@ -67,6 +68,7 @@ def setup(label, args, macros, error):
_map = '%s-%s' % (label, args[0]) _map = '%s-%s' % (label, args[0])
if 'setup' in macros.map_keys(_map): if 'setup' in macros.map_keys(_map):
error('%%%s already setup source: %s' % (label, ' '.join(args))) error('%%%s already setup source: %s' % (label, ' '.join(args)))
return
macros.set_write_map(_map) macros.set_write_map(_map)
macros.define('setup', ss) macros.define('setup', ss)
macros.unset_write_map() macros.unset_write_map()
@ -79,6 +81,7 @@ def process(label, args, macros, error):
log.trace('sources: %s' % (' '.join(args))) log.trace('sources: %s' % (' '.join(args)))
if len(args) < 3: if len(args) < 3:
error('%%%s requires at least 3 arguments: %s' % (label, ' '.join(args))) error('%%%s requires at least 3 arguments: %s' % (label, ' '.join(args)))
return
if args[0] == 'set': if args[0] == 'set':
return set(label, args[1:], macros, error) return set(label, args[1:], macros, error)
elif args[0] == 'add': elif args[0] == 'add':
@ -91,10 +94,12 @@ def hash(args, macros, error):
args = _args(args) args = _args(args)
if len(args) != 3: if len(args) != 3:
error('invalid number of hash args') error('invalid number of hash args')
return
_map = 'hashes' _map = 'hashes'
_file = macros.expand(args[1]) _file = macros.expand(args[1])
if _file in macros.map_keys(_map): if _file in macros.map_keys(_map):
error('hash already set: %s' % (args[1])) error('hash already set: %s' % (args[1]))
return
macros.create_map(_map) macros.create_map(_map)
macros.set_write_map(_map) macros.set_write_map(_map)
macros.define(_file, '%s %s' % (args[0], args[2])) macros.define(_file, '%s %s' % (args[0], args[2]))
@ -106,6 +111,7 @@ def get(label, name, macros, error):
keys = macros.map_keys(_map) keys = macros.map_keys(_map)
if len(keys) == 0: if len(keys) == 0:
error('no %s set: %s (%s)' % (label, name, _map)) error('no %s set: %s (%s)' % (label, name, _map))
return
srcs = [] srcs = []
for s in keys: for s in keys:
sm = macros.get(s, globals = False, maps = _map) sm = macros.get(s, globals = False, maps = _map)