X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/3023170fe8d7f8c0de823a858c3ef229fa2a427b..087b34fe1c67f0f50b60b15675ae2de527a3265b:/lib/cli.py

diff --git a/lib/cli.py b/lib/cli.py
index 85606d4..d1b6925 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -479,6 +479,9 @@ def GenerateTable(headers, fields, separator, data,
 
   format_fields = []
   for field in fields:
+    if headers and field not in headers:
+      raise errors.ProgrammerError("Missing header description for field '%s'"
+                                   % field)
     if separator is not None:
       format_fields.append("%s")
     elif field in numfields:
@@ -501,6 +504,7 @@ def GenerateTable(headers, fields, separator, data,
           pass
         else:
           val = row[idx] = utils.FormatUnit(val)
+      val = row[idx] = str(val)
       if separator is None:
         mlens[idx] = max(mlens[idx], len(val))