From: Petteri Aimonen <jpa@git.mail.kapsi.fi>
Date: Wed, 20 Jun 2012 18:31:23 +0000 (+0300)
Subject: Fix error when .proto contains no Messages (e.g. just enums).
X-Git-Tag: 3.99.1~14^2~493
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=3a919ddc5e13091f7212d9369e1794c038d6cdfe;p=apps%2Flow-level-can-service.git

Fix error when .proto contains no Messages (e.g. just enums).

Thanks to Paul Fertser for reporting this bug.
---

diff --git a/generator/nanopb_generator.py b/generator/nanopb_generator.py
index d41efb8..1e7e1f9 100644
--- a/generator/nanopb_generator.py
+++ b/generator/nanopb_generator.py
@@ -343,7 +343,7 @@ def toposort2(data):
     '''
     for k, v in data.items():
         v.discard(k) # Ignore self dependencies
-    extra_items_in_deps = reduce(set.union, data.values()) - set(data.keys())
+    extra_items_in_deps = reduce(set.union, data.values(), set()) - set(data.keys())
     data.update(dict([(item, set()) for item in extra_items_in_deps]))
     while True:
         ordered = set(item for item,dep in data.items() if not dep)