| 1 |
commit: f3c4a464cc38788a4946de5331c2618c183fccac |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 25 08:23:51 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 25 08:23:51 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f3c4a464 |
| 7 |
|
| 8 |
ebuild(1): fix AttributeError for merge phase |
| 9 |
|
| 10 |
File "pym/portage/dbapi/vartree.py", line 4043, in merge |
| 11 |
merge_task.start() |
| 12 |
File "pym/_emerge/AsynchronousTask.py", line 23, in start |
| 13 |
self._start() |
| 14 |
File "pym/_emerge/SpawnProcess.py", line 118, in _start |
| 15 |
self._reg_id = self.scheduler.register(files.process.fileno(), |
| 16 |
AttributeError: 'NoneType' object has no attribute 'register' |
| 17 |
|
| 18 |
--- |
| 19 |
pym/portage/dbapi/vartree.py | 3 ++- |
| 20 |
1 files changed, 2 insertions(+), 1 deletions(-) |
| 21 |
|
| 22 |
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py |
| 23 |
index a8888ae..a58521a 100644 |
| 24 |
--- a/pym/portage/dbapi/vartree.py |
| 25 |
+++ b/pym/portage/dbapi/vartree.py |
| 26 |
@@ -4036,7 +4036,8 @@ def merge(mycat, mypkg, pkgloc, infloc, |
| 27 |
background = (settings.get('PORTAGE_BACKGROUND') == '1') |
| 28 |
merge_task = MergeProcess( |
| 29 |
dblink=dblink, mycat=mycat, mypkg=mypkg, settings=settings, |
| 30 |
- treetype=mytree, vartree=vartree, scheduler=scheduler, |
| 31 |
+ treetype=mytree, vartree=vartree, |
| 32 |
+ scheduler=(scheduler or PollScheduler().sched_iface), |
| 33 |
background=background, blockers=blockers, pkgloc=pkgloc, |
| 34 |
infloc=infloc, myebuild=myebuild, mydbapi=mydbapi, |
| 35 |
prev_mtimes=prev_mtimes, logfile=settings.get('PORTAGE_LOG_FILE')) |
Archives