diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-05-09 03:00:41 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-09 03:00:41 +0000 |
| commit | 608b022043d0449cf21f6bfb6b84fe9798dd664b (patch) | |
| tree | 3cabef5830a8981497f8c6da376ff039fc4f1724 | |
| parent | Allow scheduled uninstalls to be selected the same way as other leaf nodes. (diff) | |
| download | portage-multirepo-608b022043d0449cf21f6bfb6b84fe9798dd664b.tar.gz portage-multirepo-608b022043d0449cf21f6bfb6b84fe9798dd664b.tar.bz2 portage-multirepo-608b022043d0449cf21f6bfb6b84fe9798dd664b.zip | |
Use set.instersection() instead of a for loop. (trunk r10260)
svn path=/main/branches/2.1.2/; revision=10261
| -rwxr-xr-x | bin/emerge | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -5658,6 +5658,11 @@ class PackageCounters(object): class MergeTask(object): + _opts_ignore_blockers = \ + frozenset(["--buildpkgonly", + "--fetchonly", "--fetch-all-uri", + "--nodeps", "--pretend"]) + def __init__(self, settings, trees, myopts): self.settings = settings self.target_root = settings["ROOT"] @@ -5678,10 +5683,8 @@ class MergeTask(object): self._spawned_pids = [] def _find_blockers(self, new_pkg): - for opt in ("--buildpkgonly", "--nodeps", - "--fetchonly", "--fetch-all-uri", "--pretend"): - if opt in self.myopts: - return None + if self._opts_ignore_blockers.intersection(self.myopts): + return None blocker_dblinks = [] for blocking_pkg in self._blocker_db[ |