From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Sat, 26 Mar 2016 06:57:04 +0000 (-0400)
Subject: config: add "(more than one X)" in missing id/stream_id error msgs
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3ae2561fec31a3361f354d6c121b6ee7134c2cbf;p=deliverable%2Fbarectf.git

config: add "(more than one X)" in missing id/stream_id error msgs

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
---

diff --git a/barectf/config.py b/barectf/config.py
index 401810e..f14579f 100644
--- a/barectf/config.py
+++ b/barectf/config.py
@@ -332,13 +332,13 @@ class _MetadataSpecialFieldsValidator:
         if len(self._meta.streams) > 1:
             # yes
             if t is None:
-                raise ConfigError('need "stream_id" field in trace packet header type, but trace packet header type is missing')
+                raise ConfigError('need "stream_id" field in trace packet header type (more than one stream), but trace packet header type is missing')
 
             if type(t) is not metadata.Struct:
-                raise ConfigError('need "stream_id" field in trace packet header type, but trace packet header type is not a structure type')
+                raise ConfigError('need "stream_id" field in trace packet header type (more than one stream), but trace packet header type is not a structure type')
 
             if 'stream_id' not in t.fields:
-                raise ConfigError('need "stream_id" field in trace packet header type')
+                raise ConfigError('need "stream_id" field in trace packet header type (more than one stream)')
 
         # validate "magic" and "stream_id" types
         if type(t) is not metadata.Struct:
@@ -488,13 +488,13 @@ class _MetadataSpecialFieldsValidator:
         if len(stream.events) > 1:
             # yes
             if t is None:
-                raise ConfigError('need "id" field in stream event header type, but stream event header type is missing')
+                raise ConfigError('need "id" field in stream event header type (more than one event), but stream event header type is missing')
 
             if type(t) is not metadata.Struct:
-                raise ConfigError('need "id" field in stream event header type, but stream event header type is not a structure type')
+                raise ConfigError('need "id" field in stream event header type (more than one event), but stream event header type is not a structure type')
 
             if 'id' not in t.fields:
-                raise ConfigError('need "id" field in stream event header type')
+                raise ConfigError('need "id" field in stream event header type (more than one event)')
 
         # validate "id" and "timestamp" types
         if type(t) is not metadata.Struct: