summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-07-08 10:49:02 +0000
committerZac Medico <zmedico@gentoo.org>2008-07-08 10:49:02 +0000
commit750abd4c47104148aaebc62fb9332b34109f4399 (patch)
treef4f1311627913af2892798c8464dbee199cf9637
parent9da196c3629c65a757266c3d2079e9b57e344430 (diff)
downloadportage-750abd4c47104148aaebc62fb9332b34109f4399.tar.gz
portage-750abd4c47104148aaebc62fb9332b34109f4399.tar.bz2
portage-750abd4c47104148aaebc62fb9332b34109f4399.zip
Fix ValueError triggered when Scheduler._choose_pkg() doesn't find a package
and returns None. svn path=/main/trunk/; revision=10985
-rw-r--r--pym/_emerge/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 66f5ce4ee..d7cd8fa11 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8101,7 +8101,8 @@ class Scheduler(object):
chosen_pkg = pkg
break
- self._pkg_queue.remove(chosen_pkg)
+ if chosen_pkg is not None:
+ self._pkg_queue.remove(chosen_pkg)
return chosen_pkg
def _dependent_on_scheduled_merges(self, pkg):