Use vardbapi._excluded_dirs to filter results inside cp_list(). (trunk r10208)

svn path=/main/branches/2.1.2/; revision=10209

diff --git a/pym/portage.py b/pym/portage.py
index 8ef79150d77e326bf6bfb97c92635913cd83d66a..ff68578422279588e9f6f75bea13695cee37058c 100644 (file)
--- 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