From 652f991f7df7234d0ad518049de7b3ade5e520dd Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 5 May 2008 19:30:23 +0000
Subject: Use vardbapi._excluded_dirs to filter results inside cp_list().
 (trunk r10208)

svn path=/main/branches/2.1.2/; revision=10209
---
 pym/portage.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'pym/portage.py')

diff --git a/pym/portage.py b/pym/portage.py
index 8ef79150d..ff6857842 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6699,12 +6699,9 @@ class vardbapi(dbapi):
 
 		returnme = []
 		for x in dir_list:
-			if x.startswith("."):
-				continue
-			if x[0] == '-':
-				#writemsg(red("INCOMPLETE MERGE:")+str(x[len("-MERGING-"):])+"\n")
+			if self._excluded_dirs.match(x) is not None:
 				continue
-			ps=pkgsplit(x)
+			ps = pkgsplit(x)
 			if not ps:
 				self.invalidentry(self.root+VDB_PATH+"/"+mysplit[0]+"/"+x)
 				continue
-- 
cgit v1.2.3-1-g7c22