diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-03-16 21:50:36 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-03-18 12:48:53 -0700 |
| commit | 379b1e85b516ca17f0f220ec8ac9b9997a2b8c22 (patch) | |
| tree | ee8117606f5ca1a63d2fab3a1dd0f7bbd1e5b2bc /pym/_emerge/Binpkg.py | |
| parent | ef507665cb7b3fe697126f75e794025edf3f03eb (diff) | |
| download | portage-379b1e85b516ca17f0f220ec8ac9b9997a2b8c22.tar.gz portage-379b1e85b516ca17f0f220ec8ac9b9997a2b8c22.tar.bz2 portage-379b1e85b516ca17f0f220ec8ac9b9997a2b8c22.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. " + \ |