From: Sebastian Pipping <sping@gentoo.org>
Date: Tue, 6 Jul 2010 22:17:05 +0000 (+0200)
Subject: repoman: Fix bogus warnings "Invalid atom in [..]/package.keywords: D" when working... 
X-Git-Tag: v2.2_rc68~537
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4fa4f4cad6b9fa7180e2c06877258fadbcbaf8af;p=portage.git

repoman: Fix bogus warnings "Invalid atom in [..]/package.keywords: D" when working on CVS trees (bug #275789)
---

diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index ac191fb2a..3c552025b 100644
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -324,7 +324,7 @@ def grabfile_package(myfilename, compatlevel=0, recursive=0):
 def grablines(myfilename,recursive=0):
 	mylines=[]
 	if recursive and os.path.isdir(myfilename):
-		if myfilename in ["RCS", "CVS", "SCCS"]:
+		if os.path.basename(myfilename) in ["RCS", "CVS", "SCCS"]:
 			return mylines
 		dirlist = os.listdir(myfilename)
 		dirlist.sort()