diff options
author | Volker Schroer <3470424+dl1ksv@users.noreply.github.com> | 2019-03-20 12:16:09 +0100 |
---|---|---|
committer | Andrej Rode <mail@andrejro.de> | 2019-03-31 23:02:19 +0200 |
commit | bcb67601eb166acf6a07fd9e1053aab8213d0861 (patch) | |
tree | 6f7409ad72ab2b43230c0442267a31a5e76a83d2 | |
parent | 8afc2f9ba7eb4dac1eec801ecc4dc7a0351e3ea8 (diff) |
grc: fix generation of hier2 block in case of multiple message ports
If a hier2 block contains more than one ( input or output ) message port
GRC generates a wrong yml description of this block.
If you restart GRC, GRC terminates with an error messages is no longer usable.
This can be verified with the example here: "gr-blocks/examples/msg_passing/hier"
This example is running in 3.7 without any problems.
The modification in platform.py avoids the termination of grc
if there is an error in the flowgraph to be loaded.
-rw-r--r-- | grc/core/generator/hier_block.py | 2 | ||||
-rw-r--r-- | grc/core/platform.py | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/grc/core/generator/hier_block.py b/grc/core/generator/hier_block.py index 6968b580ca..16060f8e30 100644 --- a/grc/core/generator/hier_block.py +++ b/grc/core/generator/hier_block.py @@ -97,8 +97,6 @@ class HierBlockGenerator(TopBlockGenerator): data[direction] = [] for port in get_hier_block_io(self._flow_graph, direction): p = collections.OrderedDict() - if port.domain == Constants.GR_MESSAGE_DOMAIN: - p['id'] = port.key p['label'] = port.parent.params['label'].value if port.domain != Constants.DEFAULT_DOMAIN: p['domain'] = port.domain diff --git a/grc/core/platform.py b/grc/core/platform.py index a2c03fb5e6..46b0af6f74 100644 --- a/grc/core/platform.py +++ b/grc/core/platform.py @@ -177,7 +177,6 @@ class Platform(Element): except Exception as error: logger.exception('Error while loading %s', file_path) logger.exception(error) - raise for key, block in six.iteritems(self.blocks): category = self._block_categories.get(key, block.category) |