From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QOfZ8-0001po-RQ for garchives@archives.gentoo.org; Tue, 24 May 2011 00:33:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6AF21C01C; Tue, 24 May 2011 00:33:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 88F7F1C01C for ; Tue, 24 May 2011 00:33:33 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DEDAF1B402D for ; Tue, 24 May 2011 00:33:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0DD9380505 for ; Tue, 24 May 2011 00:33:32 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/EbuildMerge.py pym/portage/dbapi/_MergeProcess.py pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e451e90b148e58bc026b3a70f1c47f3c57ca4839 Date: Tue, 24 May 2011 00:33:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 4b6a72f4861df03c664ecc860ea370bd commit: e451e90b148e58bc026b3a70f1c47f3c57ca4839 Author: Zac Medico gentoo org> AuthorDate: Tue May 24 00:33:15 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue May 24 00:33:15 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De451e90b MergeProcess: remove unnecessary dblink attribute --- pym/_emerge/EbuildMerge.py | 3 +-- pym/portage/dbapi/_MergeProcess.py | 4 ++-- pym/portage/dbapi/vartree.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/EbuildMerge.py b/pym/_emerge/EbuildMerge.py index 28d17f9..9c35988 100644 --- 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 =20 class EbuildMerge(CompositeTask): =20 @@ -26,7 +25,7 @@ class EbuildMerge(CompositeTask): logfile =3D settings.get('PORTAGE_LOG_FILE') =20 merge_task =3D MergeProcess( - dblink=3Ddblink, mycat=3Dmycat, mypkg=3Dmypkg, settings=3Dsettings, + mycat=3Dmycat, mypkg=3Dmypkg, settings=3Dsettings, treetype=3Dself.tree, vartree=3Dvartree, scheduler=3Dself.scheduler, background=3Dbackground, blockers=3Dself.find_blockers, pkgloc=3Dpkgl= oc, infloc=3Dinfloc, myebuild=3Dmyebuild, mydbapi=3Dmydbapi, diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_Merg= eProcess.py index 62f5bec..c228606 100644 --- 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. """ =20 - __slots__ =3D ('dblink', 'mycat', 'mypkg', 'settings', 'treetype', + __slots__ =3D ('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 =3D self.blockers() - mylink =3D self.dblink(self.mycat, self.mypkg, settings=3Dself.setting= s, + mylink =3D portage.dblink(self.mycat, self.mypkg, settings=3Dself.sett= ings, treetype=3Dself.treetype, vartree=3Dself.vartree, blockers=3Dblockers, scheduler=3Dself.scheduler, pipe=3Delog_writer_fd) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index f53c209..1867cf2 100644 --- 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 =3D (settings.get('PORTAGE_BACKGROUND') =3D=3D '1') merge_task =3D MergeProcess( - dblink=3Ddblink, mycat=3Dmycat, mypkg=3Dmypkg, settings=3Dsettings, + mycat=3Dmycat, mypkg=3Dmypkg, settings=3Dsettings, treetype=3Dmytree, vartree=3Dvartree, scheduler=3D(scheduler or PollScheduler().sched_iface), background=3Dbackground, blockers=3Dblockers, pkgloc=3Dpkgloc,