CXMAN-14: Use "file" to verify image types

We used to do this anyway, but I removed it for windows support.
Of course, Cygwin has the "file" tool anyway so we should be ok.

1 files changed, 14 insertions, 2 deletions

diff --git a/cxmanage/image.py b/cxmanage/image.py
index 11ffdd4..7819be0 100644
--- a/cxmanage/image.py
+++ b/cxmanage/image.py
@@ -32,6 +32,7 @@
 """ Image objects used by the cxmanage controller """
 
 import os
+import subprocess
 import tempfile
 
 from cxmanage import CxmanageError
@@ -107,13 +108,24 @@ class Image:
 
     def verify(self):
         """ Return true if the image is valid, false otherwise """
+        try:
+            file_type = subprocess.check_output(["file", self.filename]
+                    ).split()[1]
+            if self.type == "SOC_ELF":
+                if file_type != "ELF":
+                    return False
+            elif file_type != "data":
+                return False
+        except OSError:
+            # "file" tool wasn't found, just continue without it
+            pass
 
         if self.type in ["CDB", "BOOT_LOG"]:
             # Look for "CDBH"
             contents = open(self.filename).read()
             if self.simg:
                 contents = get_simg_contents(contents)
-
-            return contents[:4] == "CDBH"
+            if contents[:4] != "CDBH":
+                return False
 
         return True