Merge branch '1.x' into 'master'

VIDA-NYU · Sep 22, 2021 · 668031b · 668031b
2 parents e693636 + 7ebf00a
commit 668031b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/reprozip/reprozip/filters.py b/reprozip/reprozip/filters.py
@@ -57,7 +57,13 @@ def python(files, input_files, **kwargs):
     for i in range(len(input_files)):
         lst = []
         for path in input_files[i]:
-            if path.suffix in ('.py', '.pyc'):
+            if (
+                path.suffix in ('.py', '.pyc')
+                or (
+                    'site-packages' in path.parts
+                    and path.suffix == '.pth'
+                )
+            ):
                 logger.info("Removing input %s", path)
             else:
                 lst.append(path)

diff --git a/reprozip/reprozip/tracer/trace.py b/reprozip/reprozip/tracer/trace.py
@@ -150,10 +150,12 @@ def get_files(conn):
         # Adds symbolic links as read files
         for filename in find_all_links(r_name.parent if r_mode & FILE_LINK
                                        else r_name, False):
-            if filename not in files:
+            try:
+                f = files[filename]
+            except KeyError:
                 f = TracedFile(filename)
-                f.read(run)
                 files[f.path] = f
+            f.read(run)
         # Go to final target
         if not r_mode & FILE_LINK:
             r_name = r_name.resolve()
@@ -175,7 +177,11 @@ def get_files(conn):
                 files[fp.path] = fp
 
         # Identifies input files
-        if r_name.is_file() and r_name not in executed:
+        if (
+            not r_mode & FILE_LINK
+            and r_name.is_file()
+            and r_name not in executed
+        ):
             access_files[-1].add(f)
     cur.close()