[gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/, pym/_emerge/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/, pym/_emerge/
Date: Tue, 24 May 2011 00:33:32 +0000 (UTC)	[thread overview]
Message-ID: <e451e90b148e58bc026b3a70f1c47f3c57ca4839.zmedico@gentoo> (raw)

commit:     e451e90b148e58bc026b3a70f1c47f3c57ca4839
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 00:33:15 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue May 24 00:33:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e451e90b

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
 
 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 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.
 	"""
 
-	__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 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 = (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,

next             reply	other threads:[~2011-05-24  0:33 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-24  0:33 Zac Medico [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-04-03 20:03 [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/, pym/_emerge/ Zac Medico
2015-08-30 23:44 Zac Medico
2014-11-20  4:08 Zac Medico
2014-02-24  9:23 Alexander Berntsen
2013-03-13  5:56 Zac Medico
2013-01-23 16:19 Zac Medico
2013-01-05 15:20 Zac Medico
2012-12-23  5:33 Arfrever Frehtes Taifersar Arahesis
2012-11-24 21:57 Zac Medico
2012-04-22 18:57 Zac Medico
2012-04-21  6:51 Zac Medico
2012-02-17 22:19 Zac Medico
2012-02-16  0:33 Zac Medico
2012-02-14 23:40 Zac Medico
2012-02-10  1:28 Zac Medico
2012-02-08  1:16 Zac Medico
2012-02-08  0:36 Zac Medico
2011-10-28  2:34 Zac Medico
2011-10-16 20:26 Zac Medico
2011-10-15  5:10 Zac Medico
2011-06-03 10:16 Zac Medico
2011-05-24  5:31 Zac Medico
2011-05-09  5:16 Zac Medico
2011-03-26  7:39 Zac Medico
2011-03-26  3:24 Zac Medico
2011-03-25  4:34 Zac Medico
2011-03-25  4:34 Zac Medico
2011-03-25  4:34 Zac Medico

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:28d17f9 dfblob:9c35988 dfblob:62f5bec dfblob:c228606
dfblob:f53c209 dfblob:1867cf2 )
 OR (
bs:"[gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/, pym/_emerge/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e451e90b148e58bc026b3a70f1c47f3c57ca4839.zmedico@gentoo \
    --to=zmedico@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox