diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-03-26 16:25:15 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-03-26 16:25:15 -0700 |
| commit | dfc5e174bdbcb21a16c5d5bb464ea4fc43b456a5 (patch) | |
| tree | d336e83de68f7f062f72eb491bf0e88bd9266eff /pym/portage/dbapi/_MergeProcess.py | |
| parent | 7ab1280c237d7c83fcc2227259f7b52a06445525 (diff) | |
| download | portage-dfc5e174bdbcb21a16c5d5bb464ea4fc43b456a5.tar.gz portage-dfc5e174bdbcb21a16c5d5bb464ea4fc43b456a5.tar.bz2 portage-dfc5e174bdbcb21a16c5d5bb464ea4fc43b456a5.zip | |
MergeProcess: query blockers in the main process
Metadata cache queries may not work for some databases from within a
subprocess. For example, sqlite is known to misbehave.
Diffstat (limited to 'pym/portage/dbapi/_MergeProcess.py')
| -rw-r--r-- | pym/portage/dbapi/_MergeProcess.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py index 43111cb16..ea7c3e6d6 100644 --- a/pym/portage/dbapi/_MergeProcess.py +++ b/pym/portage/dbapi/_MergeProcess.py @@ -114,9 +114,15 @@ class MergeProcess(SpawnProcess): elog_reader_fd, elog_writer_fd = os.pipe() fcntl.fcntl(elog_reader_fd, fcntl.F_SETFL, fcntl.fcntl(elog_reader_fd, fcntl.F_GETFL) | os.O_NONBLOCK) + blockers = None + if self.blockers is not None: + # Query blockers in the main process, since metadata cache + # queries may not work for some databases from within a + # subprocess. For example, sqlite is known to misbehave. + blockers = self.blockers() mylink = self.dblink(self.mycat, self.mypkg, settings=self.settings, treetype=self.treetype, vartree=self.vartree, - blockers=self.blockers, scheduler=self.scheduler, + blockers=blockers, scheduler=self.scheduler, pipe=elog_writer_fd) fd_pipes[elog_writer_fd] = elog_writer_fd self._elog_reg_id = self.scheduler.register(elog_reader_fd, |