xmllint update to README and reverseVpd.py

- xmllint now only called in reverseVpd.py if installed
  warning thrown if not installed

2 files changed, 8 insertions, 5 deletions

diff --git a/README b/README
index 3d6f6a8..9d8034c 100644
--- a/README
+++ b/README
@@ -30,7 +30,7 @@ Dependencies
 Python 2.7 is required.
 NOTE: RHEL6 is python 2.6 and this tool will not run there
 
-reverseVpd.py requires cmdline xmllint to cleanup the formatting of the output xml
+xmllint, if installed, is used to cleanup the formatting of the output xml
 On Ubuntu/Debian: 'apt-get install libxml2-utils'
 On Redhat/Fedora: 'yum install libxml2'
 
diff --git a/reverseVpd.py b/reverseVpd.py
index e8adce3..dff3839 100755
--- a/reverseVpd.py
+++ b/reverseVpd.py
@@ -320,10 +320,13 @@ writeTvpd(vpd, tvpdFileName)
 out.msg("Wrote tvpd file: %s" % tvpdFileName)
 
 # Now rip it through xmllint quick to cleanup formatting problems from the ET print
-rc = os.system("xmllint --format %s -o %s" % (tvpdFileName, tvpdFileName))
-if (rc):
-    out.error("Unable to call xmllint to fixing xml formatting")
-    exit(rc)
+if (os.path.isfile("/usr/bin/xmllint")):
+    rc = os.system("/usr/bin/xmllint --format %s -o %s" % (tvpdFileName, tvpdFileName))
+    if (rc):
+        out.error("Error occurred calling xmllint to fix xml formatting")
+        exit(rc)
+else:
+    out.warn("xmllint not installed - no formatting cleanup done!")
 
 # Write the sub files
 if (clCreateRecords):