MergeProcess: remove unnecessary dblink attribute

diff --git a/pym/_emerge/EbuildMerge.py b/pym/_emerge/EbuildMerge.py
index 28d17f995ced8453d3d987194a5cfc8509c46161..9c35988210090d8cf12f84374a299c673224779f 100644 (file)
--- a/pym/_emerge/EbuildMerge.py
+++ b/pym/_emerge/EbuildMerge.py
@@ -4,7 +4,6 @@
 from _emerge.CompositeTask import CompositeTask
 from portage import os
 from portage.dbapi._MergeProcess import MergeProcess
-from portage.dbapi.vartree import dblink
 
 class EbuildMerge(CompositeTask):
 
@@ -26,7 +25,7 @@ class EbuildMerge(CompositeTask):
                logfile = settings.get('PORTAGE_LOG_FILE')
 
                merge_task = MergeProcess(
-                       dblink=dblink, mycat=mycat, mypkg=mypkg, settings=settings,
+                       mycat=mycat, mypkg=mypkg, settings=settings,
                        treetype=self.tree, vartree=vartree, scheduler=self.scheduler,
                        background=background, blockers=self.find_blockers, pkgloc=pkgloc,
                        infloc=infloc, myebuild=myebuild, mydbapi=mydbapi,

diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py
index 62f5bec96bd9840185165fe6ea7ef395ead323ae..c2286067c2949b1bac3433e552923f6892ddd372 100644 (file)
--- a/pym/portage/dbapi/_MergeProcess.py
+++ b/pym/portage/dbapi/_MergeProcess.py
@@ -24,7 +24,7 @@ class MergeProcess(SpawnProcess):
        thread while files are moved or copied asynchronously.
        """
 
-       __slots__ = ('dblink', 'mycat', 'mypkg', 'settings', 'treetype',
+       __slots__ = ('mycat', 'mypkg', 'settings', 'treetype',
                'vartree', 'scheduler', 'blockers', 'pkgloc', 'infloc', 'myebuild',
                'mydbapi', 'prev_mtimes', '_elog_reader_fd', '_elog_reg_id',
                '_buf', '_elog_keys', '_locked_vdb')
@@ -155,7 +155,7 @@ class MergeProcess(SpawnProcess):
                        # access to open database connections such as that
                        # used by the sqlite metadata cache module.
                        blockers = self.blockers()
-               mylink = self.dblink(self.mycat, self.mypkg, settings=self.settings,
+               mylink = portage.dblink(self.mycat, self.mypkg, settings=self.settings,
                        treetype=self.treetype, vartree=self.vartree,
                        blockers=blockers, scheduler=self.scheduler,
                        pipe=elog_writer_fd)

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index f53c209b2e48d602c894f53dcc8550ff405b4b43..1867cf299fde8d2cf9019ce9ba76f9fd2bf76078 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -4175,7 +4175,7 @@ def merge(mycat, mypkg, pkgloc, infloc,
                return errno.EACCES
        background = (settings.get('PORTAGE_BACKGROUND') == '1')
        merge_task = MergeProcess(
-               dblink=dblink, mycat=mycat, mypkg=mypkg, settings=settings,
+               mycat=mycat, mypkg=mypkg, settings=settings,
                treetype=mytree, vartree=vartree,
                scheduler=(scheduler or PollScheduler().sched_iface),
                background=background, blockers=blockers, pkgloc=pkgloc,