updating include_file

Signed-off-by: Vanessa Sochat <[email protected]>

Author: vsoch

singularity/analysis/reproduce/criteria.py

@@ -40,13 +40,8 @@ def include_file(member_path, file_filter):
 
     # Regular expression?
     if "regexp" in file_filter:
-        if file_filter['regexp'] is not None and member_path is not None:
-            try: 
-                if re.search(file_filter["regexp"], member_path):
-                    return True
-            except:
-                   print(member_path)
-                   print(file_filter)
+        if re.search(file_filter["regexp"], member_path):
+            return True
     return False
 
 

singularity/analysis/reproduce/hash.py

@@ -122,10 +122,10 @@ def get_image_hash(image_path,
         # For files, we either assess content, or include the file
         if member.isdir() or member.issym():
             continue
-        elif assess_content(member,file_filter):
-            content = extract_content(image_path,member.name)
+        elif assess_content(member, file_filter):
+            content = extract_content(image_path, member.name)
             hasher.update(content)
-        elif include_file(member,file_filter):
+        elif include_file(member.name, file_filter):
             buf = member.tobuf()
             hasher.update(buf)