Merge pull request #587 from truenas/NAS-127325

NAS-127325 / 24.04-RC.1 / Properly cleanup old manifest from the cloned `/data` directory
truenas · Feb 14, 2024 · 6e6a6df · 6e6a6df
2 parents a64fae0 + 1827421
commit 6e6a6df
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/truenas_install/__main__.py b/truenas_install/__main__.py
@@ -464,12 +464,14 @@ def main():
                     for excluded in data_exclude:
                         remove = f"{root}/{excluded}"
                         try:
-                            shutil.rmtree(remove, True)
+                            shutil.rmtree(remove)
                         except NotADirectoryError:
                             try:
                                 os.unlink(remove)
                             except FileNotFoundError:
                                 pass
+                        except FileNotFoundError:
+                            pass
 
                 exclude_list = []
                 for walk_root, dirs, files in os.walk(root):