summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-09-05 12:52:56 -0700
committerZac Medico <zmedico@gentoo.org>2010-09-05 12:52:56 -0700
commit0b3f768d853f262db2b6caee46263b3c5b23ecd5 (patch)
tree1f1565f949367f8e92ad068d4d338473c1df7994
parentbcbfc8fd20da6b8c7d07892210d45df883a4c58e (diff)
downloadportage-0b3f768d853f262db2b6caee46263b3c5b23ecd5.tar.gz
portage-0b3f768d853f262db2b6caee46263b3c5b23ecd5.tar.bz2
portage-0b3f768d853f262db2b6caee46263b3c5b23ecd5.zip
Make dblink._merge() use a PollScheduler instance directly since
TaskScheduler isn't really needed.
-rw-r--r--pym/portage/dbapi/vartree.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 25956f198..c5c772949 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -51,7 +51,7 @@ from portage import _selinux_merge
from portage import _unicode_decode
from portage import _unicode_encode
-from _emerge.TaskScheduler import TaskScheduler
+from _emerge.PollScheduler import PollScheduler
from _emerge.MiscFunctionsProcess import MiscFunctionsProcess
import codecs
@@ -3859,14 +3859,13 @@ class dblink(object):
phase = 'die_hooks'
if self._scheduler is None:
- task_scheduler = TaskScheduler()
ebuild_phase = MiscFunctionsProcess(
background=False,
commands=[phase],
- scheduler=task_scheduler.sched_iface,
+ scheduler=PollScheduler().sched_iface,
settings=self.settings)
- task_scheduler.add(ebuild_phase)
- task_scheduler.run()
+ ebuild_phase.start()
+ ebuild_phase.wait()
else:
self._scheduler.dblinkEbuildPhase(
self, mydbapi, myebuild, phase)