From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id ED056138262 for ; Wed, 18 May 2016 06:10:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C128C21C06D; Wed, 18 May 2016 06:10:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6F01821C06D for ; Wed, 18 May 2016 06:10:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 11F9B340A9C for ; Wed, 18 May 2016 06:10:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CEE8A964 for ; Wed, 18 May 2016 06:10:50 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1463551721.6f47784b6a706a51bddfdb0056b3d078a16ab80d.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/revdep_rebuild/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: pym/gentoolkit/revdep_rebuild/collect.py X-VCS-Directories: pym/gentoolkit/revdep_rebuild/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 6f47784b6a706a51bddfdb0056b3d078a16ab80d X-VCS-Branch: master Date: Wed, 18 May 2016 06:10:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3d4668ed-86bc-4fb2-b47c-094535342228 X-Archives-Hash: 4bad86866103fbadd2b423183f7a18fc commit: 6f47784b6a706a51bddfdb0056b3d078a16ab80d Author: Brian Dolbec gentoo org> AuthorDate: Wed May 18 06:06:46 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Wed May 18 06:08:41 2016 +0000 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=6f47784b 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. pym/gentoolkit/revdep_rebuild/collect.py | 12 ++++++------ 1 file 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):