| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-09 03:00:41 +0000 (Fri, 09 May 2008) |
| 3 |
New Revision: 10261 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Use set.instersection() instead of a for loop. (trunk r10260) |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/branches/2.1.2/bin/emerge |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.2/bin/emerge 2008-05-09 03:00:10 UTC (rev 10260) |
| 14 |
+++ main/branches/2.1.2/bin/emerge 2008-05-09 03:00:41 UTC (rev 10261) |
| 15 |
@@ -5658,6 +5658,11 @@ |
| 16 |
|
| 17 |
class MergeTask(object): |
| 18 |
|
| 19 |
+ _opts_ignore_blockers = \ |
| 20 |
+ frozenset(["--buildpkgonly", |
| 21 |
+ "--fetchonly", "--fetch-all-uri", |
| 22 |
+ "--nodeps", "--pretend"]) |
| 23 |
+ |
| 24 |
def __init__(self, settings, trees, myopts): |
| 25 |
self.settings = settings |
| 26 |
self.target_root = settings["ROOT"] |
| 27 |
@@ -5678,10 +5683,8 @@ |
| 28 |
self._spawned_pids = [] |
| 29 |
|
| 30 |
def _find_blockers(self, new_pkg): |
| 31 |
- for opt in ("--buildpkgonly", "--nodeps", |
| 32 |
- "--fetchonly", "--fetch-all-uri", "--pretend"): |
| 33 |
- if opt in self.myopts: |
| 34 |
- return None |
| 35 |
+ if self._opts_ignore_blockers.intersection(self.myopts): |
| 36 |
+ return None |
| 37 |
|
| 38 |
blocker_dblinks = [] |
| 39 |
for blocking_pkg in self._blocker_db[ |
| 40 |
|
| 41 |
-- |
| 42 |
gentoo-commits@l.g.o mailing list |
Archives