From f3c4a464cc38788a4946de5331c2618c183fccac Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 25 Mar 2011 01:23:51 -0700 Subject: ebuild(1): fix AttributeError for merge phase File "pym/portage/dbapi/vartree.py", line 4043, in merge merge_task.start() File "pym/_emerge/AsynchronousTask.py", line 23, in start self._start() File "pym/_emerge/SpawnProcess.py", line 118, in _start self._reg_id = self.scheduler.register(files.process.fileno(), AttributeError: 'NoneType' object has no attribute 'register' --- pym/portage/dbapi/vartree.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pym') 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')) -- cgit v1.2.3-1-g7c22