diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-11-11 05:01:58 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-11 05:01:58 +0000 |
| commit | 38fd16834433ee39610fa5923fe2d3fa5f0d793d (patch) | |
| tree | e44728fa6b2f90d050ead885ed64e7b96e4c7638 | |
| parent | e67f1ca80eae405c3a7819da391a56095d350f40 (diff) | |
| download | portage-38fd16834433ee39610fa5923fe2d3fa5f0d793d.tar.gz portage-38fd16834433ee39610fa5923fe2d3fa5f0d793d.tar.bz2 portage-38fd16834433ee39610fa5923fe2d3fa5f0d793d.zip | |
When in --nodeps mode, make Scheduler._set_digraph() discard the digraph and
make Scheduler._choose_pkg() always return the task at the front of the queue.
svn path=/main/trunk/; revision=11847
| -rw-r--r-- | pym/_emerge/__init__.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index f9304dd72..7ef69a969 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -9269,8 +9269,8 @@ class Scheduler(PollScheduler): return interactive_tasks def _set_digraph(self, digraph): - if self._max_jobs is not True and \ - self._max_jobs < 2: + if "--nodeps" in self.myopts or \ + (self._max_jobs is not True and self._max_jobs < 2): # save some memory self._digraph = None return @@ -9908,7 +9908,8 @@ class Scheduler(PollScheduler): return None if self._digraph is None: - if self._jobs or self._task_queues.merge: + if (self._jobs or self._task_queues.merge) and \ + "--nodeps" not in self.myopts: self._choose_pkg_return_early = True return None return self._pkg_queue.pop(0) |