commit 00244345eec7be07507e8d70e5733e1412a1a77f
author Michael Walsh <micwalsh@us.ibm.com> Thu Aug 29 10:35:50 2019 -0500
committer George Keishing <gkeishin@in.ibm.com> Tue Sep 03 16:47:30 2019 +0000
tree cedc6635bac74a60ea7a905ba9e4ae4876113037
parent 6f8ac5d7b3b19fb1c4da0ea6b642428539c36185

valid_path: use gp.blank() on print_var

valid_path, valid_dir_path and valid_file_path should use the gp.blank
formatting option when printing the variable with the invalid value.
It makes it more obvious when the field is blank.

Change-Id: Iab113ffcd99cd97215aac619903765477ef0d1e8
Signed-off-by: Michael Walsh <micwalsh@us.ibm.com>

lib/gen_valid.py

diff --git a/lib/gen_valid.py b/lib/gen_valid.py
index 8725077..53466dc 100755
--- a/lib/gen_valid.py
+++ b/lib/gen_valid.py
@@ -6,7 +6,6 @@
 """
 
 import os
-import re
 import gen_print as gp
 import gen_cmd as gc
 import func_args as fa
@@ -388,7 +387,7 @@
     if not os.path.isdir(str(var_value)):
         var_name = get_var_name(*args, **kwargs)
         error_message += "The following directory does not exist:\n"
-        error_message += gp.sprint_varx(var_name, var_value)
+        error_message += gp.sprint_varx(var_name, var_value, gp.blank())
 
     return process_error_message(error_message)
 
@@ -405,7 +404,7 @@
     if not os.path.isfile(str(var_value)):
         var_name = get_var_name(*args, **kwargs)
         error_message += "The following file does not exist:\n"
-        error_message += gp.sprint_varx(var_name, var_value)
+        error_message += gp.sprint_varx(var_name, var_value, gp.blank())
 
     return process_error_message(error_message)
 
@@ -423,7 +422,7 @@
     if not (os.path.isfile(str(var_value)) or os.path.isdir(str(var_value))):
         var_name = get_var_name(*args, **kwargs)
         error_message += "Invalid path (file or directory does not exist):\n"
-        error_message += gp.sprint_varx(var_name, var_value)
+        error_message += gp.sprint_varx(var_name, var_value, gp.blank())
 
     return process_error_message(error_message)
 
@@ -586,7 +585,7 @@
         var_name = get_var_name(*args, **kwargs)
         error_message += "The following required program could not be found"
         error_message += " using the $PATH environment variable:\n"
-        error_message += gp.sprint_varx(var_name, var_value)
+        error_message += gp.sprint_varx(var_name, var_value, gp.blank())
         PATH = os.environ.get("PATH", "").split(":")
         error_message += "\n"
         error_message += gp.sprint_var(PATH)