util: Enhance the error messages for packet encode/decode

This patch adds a more verbose error message when the Python protobuf
module cannot be loaded.

diff --git a/util/decode_packet_trace.py b/util/decode_packet_trace.py
index fa0ea9604c12f0b776d8f53f46657aa3dff99874..da9a7aa8324fe30d48a3f4b043c2373f69583ccb 100755 (executable)
--- a/util/decode_packet_trace.py
+++ b/util/decode_packet_trace.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2013 ARM Limited
+# Copyright (c) 2013-2014 ARM Limited
 # All rights reserved
 #
 # The license below extends only to copyright in the software and shall
@@ -92,8 +92,15 @@ except:
     error = call(['protoc', '--python_out=util', '--proto_path=src/proto',
                   'src/proto/packet.proto'])
     if not error:
-        import packet_pb2
         print "Generated packet proto definitions"
+
+        try:
+            import google.protobuf
+        except:
+            print "Please install Python protobuf module"
+            exit(-1)
+
+        import packet_pb2
     else:
         print "Failed to import packet proto definitions"
         exit(-1)

diff --git a/util/encode_packet_trace.py b/util/encode_packet_trace.py
index fc6ddf7fd8967b19ce1f6d178a90f1679ef19297..13057a13d8c53fdb73806806ba5d454d9c87cf87 100755 (executable)
--- a/util/encode_packet_trace.py
+++ b/util/encode_packet_trace.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2013 ARM Limited
+# Copyright (c) 2013-2014 ARM Limited
 # All rights reserved
 #
 # The license below extends only to copyright in the software and shall
@@ -97,8 +97,15 @@ except:
     error = call(['protoc', '--python_out=util', '--proto_path=src/proto',
                   'src/proto/packet.proto'])
     if not error:
-        import packet_pb2
         print "Generated packet proto definitions"
+
+        try:
+            import google.protobuf
+        except:
+            print "Please install the Python protobuf module"
+            exit(-1)
+
+        import packet_pb2
     else:
         print "Failed to import packet proto definitions"
         exit(-1)