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 1QKOkW-0006M3-Rl for garchives@archives.gentoo.org; Thu, 12 May 2011 05:47:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B143E041F; Thu, 12 May 2011 05:47:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DACACE041F for ; Thu, 12 May 2011 05:47:40 +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 48ADB1B40AD for ; Thu, 12 May 2011 05:47:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9EEEE80505 for ; Thu, 12 May 2011 05:47:39 +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: <042e0231b4fa8ab7b5de707e64e5f427530caac6.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:2.1.9 commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 042e0231b4fa8ab7b5de707e64e5f427530caac6 Date: Thu, 12 May 2011 05:47:39 +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: 0d19b01cafb2b3a2e74ac3d76bb3a61a commit: 042e0231b4fa8ab7b5de707e64e5f427530caac6 Author: Zac Medico gentoo org> AuthorDate: Thu May 12 05:38:47 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu May 12 05:38:47 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D042e0231 dblink: fix broken counter references --- pym/portage/dbapi/vartree.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 079743c..1edda24 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3915,10 +3915,10 @@ class dblink(object): =20 return self._merge(mergeroot, inforoot, myebuild=3Dmyebuild, cleanup=3Dcleanup, - mydbapi=3Dmydbapi, prev_mtimes=3Dprev_mtimes) + mydbapi=3Dmydbapi, prev_mtimes=3Dprev_mtimes, counter=3Dcounter) =20 def _merge(self, mergeroot, inforoot, myroot=3DNone, myebuild=3DNone, c= leanup=3D0, - mydbapi=3DNone, prev_mtimes=3DNone): + mydbapi=3DNone, prev_mtimes=3DNone, counter=3DNone): """ @param myroot: ignored, self._eroot is used instead """