From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 12 May 2011 05:38:47 +0000 (-0700)
Subject: dblink: fix broken counter references
X-Git-Tag: v2.1.9.49~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=042e0231b4fa8ab7b5de707e64e5f427530caac6;p=portage.git

dblink: fix broken counter references
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 079743c90..1edda244c 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3915,10 +3915,10 @@ class dblink(object):
 
 		return self._merge(mergeroot, inforoot,
 				myebuild=myebuild, cleanup=cleanup,
-				mydbapi=mydbapi, prev_mtimes=prev_mtimes)
+				mydbapi=mydbapi, prev_mtimes=prev_mtimes, counter=counter)
 
 	def _merge(self, mergeroot, inforoot, myroot=None, myebuild=None, cleanup=0,
-		mydbapi=None, prev_mtimes=None):
+		mydbapi=None, prev_mtimes=None, counter=None):
 		"""
 		@param myroot: ignored, self._eroot is used instead
 		"""