Updating error message in xproto
Change-Id: I21ff9746e61f83d83c7cc64c452913d1299b49f9
diff --git a/lib/xos-genx/xosgenx/jinja2_extensions/base.py b/lib/xos-genx/xosgenx/jinja2_extensions/base.py
index dd19bd8..1293863 100644
--- a/lib/xos-genx/xosgenx/jinja2_extensions/base.py
+++ b/lib/xos-genx/xosgenx/jinja2_extensions/base.py
@@ -176,7 +176,7 @@
else:
return tuple([xproto_tuplify(i) for i in nested_list_or_set])
-def xproto_field_graph_components(fields, tag='unique_with'):
+def xproto_field_graph_components(fields, model, tag='unique_with'):
def find_components(graph):
pending = set(graph.keys())
components = []
@@ -188,10 +188,10 @@
while front:
node = front.pop()
neighbours = graph[node]
- neighbours-=component # These we have already visited
+ neighbours -= component # These we have already visited
front |= neighbours
- pending-=neighbours
+ pending -= neighbours
component |= neighbours
components.append(component)
@@ -208,15 +208,14 @@
for uf in tagged_fields:
if uf not in field_names:
- raise FieldNotFound('Field %s not found'%uf)
+ raise FieldNotFound('Field "%s" not found in model "%s", referenced from field "%s" by option "%s"' % (uf, model['name'], f['name'], tag))
- field_graph.setdefault(f['name'],set()).add(uf)
- field_graph.setdefault(uf,set()).add(f['name'])
+ field_graph.setdefault(f['name'], set()).add(uf)
+ field_graph.setdefault(uf, set()).add(f['name'])
except KeyError:
pass
- components = find_components(field_graph)
- return components
+ return find_components(field_graph)
def xproto_api_opts(field):
options = []