Intermediate checking before change merge functionality

1 files changed, 33 insertions, 10 deletions

diff --git a/createVpd.py b/createVpd.py
index 138a0ce..098bd2d 100755
--- a/createVpd.py
+++ b/createVpd.py
@@ -48,16 +48,39 @@ if (cmdline.parseOption("-h","--help")):
     help()
     exit(0)
 
-tree = ET.parse('tvpd/vini.tvpd')
-root = tree.getroot()
-root.tag
-root.attrib
-for child in root:
-    print child.tag, child.attrib
-
-xml_files = glob.glob("tvpd/*.tvpd")
-
-m = merge(xml_files)
+# Look for input files - the option can be repeated multiple times
+clInputFiles = list()
+while True:
+    clInputFile = cmdline.parseOptionWithArg("-i")
+    if (clInputFile == None):
+        break
+    else:
+      clInputFiles.append(clInputFile)
+
+# Error check we got input files
+if (len(clInputFiles) == 0):
+    print("ERROR: At least 1 -i arg is required")
+    clError+=1
+
+# Error check the command line
+if (clError):
+    print("ERROR: Missing required cmdline args!  Please review the output above to determine which ones!")
+    exit(clError)
+
+# All cmdline args should be processed, so if any left throw an error
+if (len(sys.argv) != 1):
+    print("ERROR: Extra cmdline args detected - %s" % (sys.argv[1:])) # [1:] don't inclue script name in the list
+    exit(len(sys.argv))
+
+files = list()
+for file in clInputFiles:
+    files.extend(glob.glob(file))
+
+#xml_files = glob.glob("tvpd/opfr.tvpd")
+
+print(files)
+
+m = merge(files)
 
 print "++++++++++++++++"
 print m