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 209E1198005 for ; Tue, 19 Mar 2013 21:57:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B2C3E04F2; Tue, 19 Mar 2013 21:57:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35045E04F2 for ; Tue, 19 Mar 2013 21:57:04 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3074533D841 for ; Tue, 19 Mar 2013 21:57:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BE072E4073 for ; Tue, 19 Mar 2013 21:57:01 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1363730206.ce4018f642cec0220ce26d57855754324cdd37fc.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/manifest.py X-VCS-Directories: pym/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ce4018f642cec0220ce26d57855754324cdd37fc X-VCS-Branch: master Date: Tue, 19 Mar 2013 21:57:01 +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: 46dd2047-5896-429b-953a-021a7542c293 X-Archives-Hash: 1be31afeaae9cd6fdf126182c7bf51ea commit: ce4018f642cec0220ce26d57855754324cdd37fc Author: Zac Medico gentoo org> AuthorDate: Tue Mar 19 21:56:46 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Mar 19 21:56:46 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ce4018f6 manifest2MiscfileFilter: remove redundant checks Checks for directory names are not needed since only regular files are passed in here. --- pym/portage/manifest.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py index 5b40826..510e203 100644 --- a/pym/portage/manifest.py +++ b/pym/portage/manifest.py @@ -25,8 +25,7 @@ from portage.exception import DigestException, FileNotFound, \ InvalidDataType, MissingParameter, PermissionDenied, \ PortageException, PortagePackageException from portage.const import (MANIFEST1_HASH_FUNCTIONS, MANIFEST2_HASH_DEFAULTS, - MANIFEST2_HASH_FUNCTIONS, MANIFEST2_IDENTIFIERS, MANIFEST2_REQUIRED_HASH, - VCS_DIRS) + MANIFEST2_HASH_FUNCTIONS, MANIFEST2_IDENTIFIERS, MANIFEST2_REQUIRED_HASH) from portage.localization import _ _manifest_re = re.compile( @@ -53,8 +52,7 @@ def manifest2AuxfileFilter(filename): return not filename[:7] == 'digest-' def manifest2MiscfileFilter(filename): - filename = filename.strip(os.sep) - return not (filename in VCS_DIRS + ("files", "Manifest") or filename.endswith(".ebuild")) + return not (filename == "Manifest" or filename.endswith(".ebuild")) def guessManifestFileType(filename): """ Perform a best effort guess of which type the given filename is, avoid using this if possible """