bugfix: tar --delay-directory-restore for weird tars, make `_calc_d…

…ir_size` non critical
Wazzaps · May 23, 2022 · 543d56a · 543d56a
1 parent cce6621
commit 543d56a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/ampm/__init__.py b/ampm/__init__.py
@@ -1 +1 @@
-__version__ = '1.3.1'
+__version__ = '1.3.2'
diff --git a/ampm/repo/nfs.py b/ampm/repo/nfs.py
@@ -480,7 +480,7 @@ def in_writer():
             elif metadata.path_type == 'tar.gz':
                 tmp_local_path.mkdir(parents=True)
                 decompressor = subprocess.Popen(
-                    ['tar', 'xz'],
+                    ['tar', '--delay-directory-restore', '-xz'],
                     stdin=subprocess.PIPE,
                     stdout=subprocess.PIPE,
                     cwd=str(tmp_local_path),

diff --git a/ampm/utils.py b/ampm/utils.py
@@ -14,7 +14,10 @@ def _calc_dir_size(path: Path) -> int:
     for dirpath, _dirnames, filenames in os.walk(path):
         for f in filenames:
             fp = os.path.join(dirpath, f)
-            total_size += os.path.getsize(fp)
+            try:
+                total_size += os.path.getsize(fp)
+            except FileNotFoundError:
+                pass
     return total_size