diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-11-11 05:39:32 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-11 05:39:32 +0000 |
| commit | afa6c3deda57361f09f651b0656e692207cd3d95 (patch) | |
| tree | 4e646835f4795bbf290732bedb7fe4d86b274a26 | |
| parent | 38fd16834433ee39610fa5923fe2d3fa5f0d793d (diff) | |
| download | portage-afa6c3deda57361f09f651b0656e692207cd3d95.tar.gz portage-afa6c3deda57361f09f651b0656e692207cd3d95.tar.bz2 portage-afa6c3deda57361f09f651b0656e692207cd3d95.zip | |
Fix logic from previous commit in Scheduler._choose_pkg() to ensure that
the --nodeps code is only triggered when --jobs > 1.
svn path=/main/trunk/; revision=11848
| -rw-r--r-- | pym/_emerge/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 7ef69a969..cc8208f4e 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -9909,7 +9909,8 @@ class Scheduler(PollScheduler): if self._digraph is None: if (self._jobs or self._task_queues.merge) and \ - "--nodeps" not in self.myopts: + not ("--nodeps" in self.myopts and \ + (self._max_jobs is True or self._max_jobs > 1)): self._choose_pkg_return_early = True return None return self._pkg_queue.pop(0) |