From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 19 Mar 2013 21:56:46 +0000 (-0700)
Subject: manifest2MiscfileFilter: remove redundant checks
X-Git-Tag: v2.2.0_alpha167
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ce4018f642cec0220ce26d57855754324cdd37fc;p=portage.git

manifest2MiscfileFilter: remove redundant checks

Checks for directory names are not needed since only regular files
are passed in here.
---

diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py
index 5b4082686..510e203a7 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 """