From 058ecd36cb7cd556c6c9920a94ab93776bc6806c Mon Sep 17 00:00:00 2001
From: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date: Tue, 14 Nov 2023 17:58:07 +0100
Subject: [PATCH] swh-hashtree: migrate to from_disk.Directory.path_filter
---
bin/swh-hashtree | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/bin/swh-hashtree b/bin/swh-hashtree
index a4f8d7b7..da5249af 100755
--- a/bin/swh-hashtree
+++ b/bin/swh-hashtree
@@ -15,7 +15,7 @@ from swh.model import from_disk, hashutil
def combine_filters(*filters):
"""Combine several ignore filters"""
if len(filters) == 0:
- return from_disk.accept_all_directories
+ return from_disk.accept_all_paths
elif len(filters) == 1:
return filters[0]
@@ -32,7 +32,6 @@ def combine_filters(*filters):
)
@click.option("--ignore", multiple=True, help="Ignore pattern.")
def main(path, ignore_empty_folder=False, ignore=None):
-
filters = []
if ignore_empty_folder:
filters.append(from_disk.ignore_empty_directories)
@@ -43,7 +42,7 @@ def main(path, ignore_empty_folder=False, ignore=None):
try:
d = from_disk.Directory.from_disk(
- path=os.fsencode(path), dir_filter=combine_filters(*filters)
+ path=os.fsencode(path), path_filter=combine_filters(*filters)
)
hash = d.hash
except Exception as e:
--
GitLab