From: Petteri Aimonen <jpa@git.mail.kapsi.fi>
Date: Tue, 3 Dec 2013 18:10:48 +0000 (+0200)
Subject: Fixes for pyinstaller
X-Git-Tag: 3.99.1~14^2~285
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=435ccbfdf7e48cfd809c41049d9edf4d6c267566;p=apps%2Flow-level-can-service.git

Fixes for pyinstaller
---

diff --git a/generator/nanopb_generator.py b/generator/nanopb_generator.py
index ab6f3cb..6ccb96f 100755
--- a/generator/nanopb_generator.py
+++ b/generator/nanopb_generator.py
@@ -6,7 +6,14 @@ nanopb_version = "nanopb-0.2.5-dev"
 import sys
 
 try:
+    # Add some dummy imports to keep packaging tools happy.
     import google, distutils.util # bbfreeze seems to need these
+    import pkg_resources # pyinstaller / protobuf 2.5 seem to need these
+except:
+    # Don't care, we will error out later if it is actually important.
+    pass
+
+try:
     import google.protobuf.text_format as text_format
 except:
     sys.stderr.write('''