diff options
author | Antti Kokko <antti.kokko@qt.io> | 2021-08-12 07:39:24 +0300 |
---|---|---|
committer | Antti Kokko <antti.kokko@qt.io> | 2021-08-13 10:22:45 +0000 |
commit | 8eab6dc897c99d66b53572e96f9517ff5e6983de (patch) | |
tree | f4d82782efe2d21f8de911a1408795c86ea84373 | |
parent | 83136b29aab4e2e7fe2cd59e58c28b195f99fdd9 (diff) |
content_cleaner.py: fix preserve rules list issuev6.2.0-beta3-packaging
If clean_content() is called with multiple preserve
rules the rules list has items concatenated instead
of split items.
Change-Id: I9e5d39bd0667ca9f22a0a15c03136682c117b7aa
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
-rwxr-xr-x | packaging-tools/content_cleaner.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging-tools/content_cleaner.py b/packaging-tools/content_cleaner.py index 104b25a83..e70ca17be 100755 --- a/packaging-tools/content_cleaner.py +++ b/packaging-tools/content_cleaner.py @@ -66,10 +66,10 @@ def clean_content(input_dir: str, preserve_rules: List[str]) -> None: log.info(f"Cleaning content from: '{input_dir}' - preserve_rules: {preserve_rules}") if not os.path.isdir(input_dir): raise CleanerError(f"Not a valid input directory: {input_dir}") - + split_preserve_rules = [word for line in preserve_rules for word in line.split()] with cd(input_dir): files_to_keep = [] - for mask in preserve_rules: + for mask in split_preserve_rules: files_to_keep.extend(glob(mask, recursive=True)) for p in Path(".").rglob("*"): if str(p) in files_to_keep: |