diff options
| author | Brian Dolbec <dolsen@gentoo.org> | 2016-05-17 23:06:46 -0700 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2016-05-17 23:08:41 -0700 |
| commit | 6f47784b6a706a51bddfdb0056b3d078a16ab80d (patch) | |
| tree | bbe83333d44ae9b134f7483b7642224bbdeb6ac5 | |
| parent | e4dda3ef193b109f30051f5a116158dfe23922bb (diff) | |
| download | gentoolkit-6f47784b6a706a51bddfdb0056b3d078a16ab80d.tar.gz | |
revdep-rebuild/collect.py: Fix the masking issue where some masks were not honored
The masks at this point are combined into one list, both directories and files.
The code was only checking the full path, not the files for being in the masks.
| -rw-r--r-- | pym/gentoolkit/revdep_rebuild/collect.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pym/gentoolkit/revdep_rebuild/collect.py b/pym/gentoolkit/revdep_rebuild/collect.py index 1b406e8..1f34f1c 100644 --- a/pym/gentoolkit/revdep_rebuild/collect.py +++ b/pym/gentoolkit/revdep_rebuild/collect.py @@ -110,9 +110,9 @@ def collect_libraries_from_dir(dirs, mask, logger): continue try: - for listing in os.listdir(_dir): - listing = os.path.join(_dir, listing) - if listing in mask: + for _listing in os.listdir(_dir): + listing = os.path.join(_dir, _listing) + if listing in mask or _listing in mask: continue if os.path.isdir(listing): @@ -179,9 +179,9 @@ def collect_binaries_from_dir(dirs, mask, logger): continue try: - for listing in os.listdir(_dir): - listing = os.path.join(_dir, listing) - if listing in mask: + for _listing in os.listdir(_dir): + listing = os.path.join(_dir, _listing) + if listing in mask or _listing in mask: continue if os.path.isdir(listing): |