[ correct list this time ]
On 01/03/2017 23:33, Sebastian Huber wrote:
Module: rtems-source-builder
Branch: master
Commit: 4f72b95e60eedca772994f740a1fd0c973608632
Changeset:
http://git.rtems.org/rtems-source-builder/commit/?id=4f72b95e60eedca772994f740a1fd0c973608632
Author: Sebastian Huber <sebastian.hu...@embedded-brains.de>
Date: Wed Mar 1 08:18:07 2017 +0100
Can all future commits to the RSB please be posted to the devel list for
review? This is changes to packages and changes to the code. Thanks.
sb: Bail out only if hash definitions conflict
This patch is wrong and should raise an exception if it is an error.
---
source-builder/sb/sources.py | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/source-builder/sb/sources.py b/source-builder/sb/sources.py
index fb6d819..967becc 100644
--- a/source-builder/sb/sources.py
+++ b/source-builder/sb/sources.py
@@ -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
This looks wrong (I know it is existing :)) ...
- 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
... and the same with this ...
+ else:
+ macros.create_map(_map)
+ macros.set_write_map(_map)
+ macros.define(_file, new_value)
+ macros.unset_write_map()
return None
... cause None is returned.
Chris
_______________________________________________
vc mailing list
v...@rtems.org
http://lists.rtems.org/mailman/listinfo/vc
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
