commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] [gnuradio] 04/22: grc: don't fail for unknown domains


From: git
Subject: [Commit-gnuradio] [gnuradio] 04/22: grc: don't fail for unknown domains
Date: Tue, 23 Dec 2014 09:38:56 +0000 (UTC)

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 5fc2db030c7bc52d10ca06bae452ca5d0eb99591
Author: Sebastian Koslowski <address@hidden>
Date:   Wed Dec 3 13:50:31 2014 +0100

    grc: don't fail for unknown domains
---
 grc/base/Connection.py | 7 +++++--
 grc/base/Platform.py   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/grc/base/Connection.py b/grc/base/Connection.py
index dd74f2d..abe8b4f 100644
--- a/grc/base/Connection.py
+++ b/grc/base/Connection.py
@@ -86,8 +86,11 @@ class Connection(Element):
         sink_domain = self.get_sink().get_domain()
         if (source_domain, sink_domain) not in 
platform.get_connection_templates():
             self.add_error_message('No connection known for domains "%s", 
"%s"' % (source_domain, sink_domain))
-        multiple_sinks = 
platform.get_domain(key=self.get_source().get_domain())['multiple_sinks']
-        if not multiple_sinks and len(self.get_source().get_connections()) > 1:
+
+        if (source_domain in platform.get_domains() and
+            not platform.get_domain(key=source_domain)['multiple_sinks'] and
+            len(self.get_source().get_connections()) > 1
+        ):
             self.add_error_message('Source domain "%s" can have only one 
downstream block' % source_domain)
 
 
diff --git a/grc/base/Platform.py b/grc/base/Platform.py
index 91969b2..744b546 100644
--- a/grc/base/Platform.py
+++ b/grc/base/Platform.py
@@ -223,7 +223,7 @@ class Platform(_Element):
     def get_new_block(self, flow_graph, key): return self.Block(flow_graph, 
n=self._blocks_n[key])
 
     def get_domains(self): return self._domains
-    def get_domain(self, key): return self._domains[key]
+    def get_domain(self, key): return self._domains.get(key)
     def get_connection_templates(self): return self._connection_templates
 
     def get_name(self): return self._name



reply via email to

[Prev in Thread] Current Thread [Next in Thread]