diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-03-16 21:50:36 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-03-16 21:50:36 -0700 |
| commit | f7b5b5f0da301d8f5c5585c21db238e28546c70f (patch) | |
| tree | 685bb38b23431960ba723b04baed50a8a9d6b8e7 /pym/_emerge/Binpkg.py | |
| parent | 9fa6881ac70e799e09fe98c1eb24177663f3b0e5 (diff) | |
| download | portage-f7b5b5f0da301d8f5c5585c21db238e28546c70f.tar.gz portage-f7b5b5f0da301d8f5c5585c21db238e28546c70f.tar.bz2 portage-f7b5b5f0da301d8f5c5585c21db238e28546c70f.zip | |
Scheduler: tweak prefetcher cancellation logic
This should prevent "TypeError: an integer is required" raised from
waitpid when trying to cancel a prefetcher that never started.
Diffstat (limited to 'pym/_emerge/Binpkg.py')
| -rw-r--r-- | pym/_emerge/Binpkg.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py index b011b001f..00587451a 100644 --- a/pym/_emerge/Binpkg.py +++ b/pym/_emerge/Binpkg.py @@ -77,9 +77,8 @@ class Binpkg(CompositeTask): prefetcher = self.prefetcher if prefetcher is None: pass - elif not prefetcher.isAlive(): - prefetcher.cancel() - elif prefetcher.poll() is None: + elif prefetcher.isAlive() and \ + prefetcher.poll() is None: waiting_msg = ("Fetching '%s' " + \ "in the background. " + \ |