summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/portage/dbapi/vartree.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index a8888ae95..a58521a36 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -4036,7 +4036,8 @@ def merge(mycat, mypkg, pkgloc, infloc,
background = (settings.get('PORTAGE_BACKGROUND') == '1')
merge_task = MergeProcess(
dblink=dblink, mycat=mycat, mypkg=mypkg, settings=settings,
- treetype=mytree, vartree=vartree, scheduler=scheduler,
+ treetype=mytree, vartree=vartree,
+ scheduler=(scheduler or PollScheduler().sched_iface),
background=background, blockers=blockers, pkgloc=pkgloc,
infloc=infloc, myebuild=myebuild, mydbapi=mydbapi,
prev_mtimes=prev_mtimes, logfile=settings.get('PORTAGE_LOG_FILE'))