mirror of
https://git.rtems.org/rtems-source-builder
synced 2024-10-09 07:15:10 +08:00
sb: Bail out only if hash definitions conflict
This commit is contained in:
parent
08f709966f
commit
4f72b95e60
@ -97,13 +97,17 @@ def hash(args, macros, error):
|
||||
return
|
||||
_map = 'hashes'
|
||||
_file = macros.expand(args[1])
|
||||
if _file in macros.map_keys(_map):
|
||||
error('hash already set: %s' % (args[1]))
|
||||
return
|
||||
macros.create_map(_map)
|
||||
macros.set_write_map(_map)
|
||||
macros.define(_file, '%s %s' % (args[0], args[2]))
|
||||
macros.unset_write_map()
|
||||
new_value = '%s %s' % (args[0], args[2])
|
||||
existing_value = get_hash(_file, macros)
|
||||
if existing_value is not None:
|
||||
if existing_value != new_value:
|
||||
error('conflicting hash definitions for: %s' % (args[1]))
|
||||
return
|
||||
else:
|
||||
macros.create_map(_map)
|
||||
macros.set_write_map(_map)
|
||||
macros.define(_file, new_value)
|
||||
macros.unset_write_map()
|
||||
return None
|
||||
|
||||
def get(label, name, macros, error):
|
||||
|
Loading…
x
Reference in New Issue
Block a user