From: Marius Mauch <genone@gentoo.org>
Date: Thu, 11 Jan 2007 08:47:50 +0000 (-0000)
Subject: Extend ignore filter for grablines (bug #144445)
X-Git-Tag: v2.1.2~83
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f9352983c70e5bebb3f7f7e8154d8bd85d3b14c1;p=portage.git

Extend ignore filter for grablines (bug #144445)

svn path=/main/trunk/; revision=5548
---

diff --git a/pym/portage_util.py b/pym/portage_util.py
index b1199989c..c7455a309 100644
--- a/pym/portage_util.py
+++ b/pym/portage_util.py
@@ -228,10 +228,12 @@ 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"]:
+			continue
 		dirlist = os.listdir(myfilename)
 		dirlist.sort()
 		for f in dirlist:
-			if not f.startswith("."):
+			if not f.startswith(".") and not f.endswith("~"):
 				mylines.extend(grablines(
 					os.path.join(myfilename, f), recursive))
 	else: