| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-05 19:30:23 +0000 (Mon, 05 May 2008) |
| 3 |
New Revision: 10209 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/pym/portage.py |
| 7 |
Log: |
| 8 |
Use vardbapi._excluded_dirs to filter results inside cp_list(). (trunk r10208) |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/branches/2.1.2/pym/portage.py |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.2/pym/portage.py 2008-05-05 19:29:54 UTC (rev 10208) |
| 14 |
+++ main/branches/2.1.2/pym/portage.py 2008-05-05 19:30:23 UTC (rev 10209) |
| 15 |
@@ -6699,12 +6699,9 @@ |
| 16 |
|
| 17 |
returnme = [] |
| 18 |
for x in dir_list: |
| 19 |
- if x.startswith("."): |
| 20 |
+ if self._excluded_dirs.match(x) is not None: |
| 21 |
continue |
| 22 |
- if x[0] == '-': |
| 23 |
- #writemsg(red("INCOMPLETE MERGE:")+str(x[len("-MERGING-"):])+"\n") |
| 24 |
- continue |
| 25 |
- ps=pkgsplit(x) |
| 26 |
+ ps = pkgsplit(x) |
| 27 |
if not ps: |
| 28 |
self.invalidentry(self.root+VDB_PATH+"/"+mysplit[0]+"/"+x) |
| 29 |
continue |
| 30 |
|
| 31 |
-- |
| 32 |
gentoo-commits@l.g.o mailing list |
Archives