From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-99878-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1Kw0ne-0006m9-Po
	for garchives@archives.gentoo.org; Fri, 31 Oct 2008 20:40:55 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id D1B4FE04F1;
	Fri, 31 Oct 2008 20:40:53 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id AB2FBE04F1
	for <gentoo-commits@lists.gentoo.org>; Fri, 31 Oct 2008 20:40:53 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id 1D4C864667
	for <gentoo-commits@lists.gentoo.org>; Fri, 31 Oct 2008 20:40:52 +0000 (UTC)
Received: from zmedico by stork.gentoo.org with local (Exim 4.69)
	(envelope-from <zmedico@stork.gentoo.org>)
	id 1Kw0nb-0007dd-Kl
	for gentoo-commits@lists.gentoo.org; Fri, 31 Oct 2008 20:40:51 +0000
To: gentoo-commits@lists.gentoo.org
From: "Zac Medico (zmedico)" <zmedico@gentoo.org>
Subject: [gentoo-commits] portage r11767 - main/trunk/pym/portage/dbapi
X-VCS-Repository: portage
X-VCS-Revision: 11767
X-VCS-Files: main/trunk/pym/portage/dbapi/vartree.py
X-VCS-Directories: main/trunk/pym/portage/dbapi
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
Content-Type: text/plain; charset=UTF-8
Message-Id: <E1Kw0nb-0007dd-Kl@stork.gentoo.org>
Sender: Zac Medico <zmedico@stork.gentoo.org>
Date: Fri, 31 Oct 2008 20:40:51 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 87e7d600-2814-4ca3-9d22-8f9cd80afd63
X-Archives-Hash: c3bfda716b50d53afb6aa43fc86f9552

Author: zmedico
Date: 2008-10-31 20:40:51 +0000 (Fri, 31 Oct 2008)
New Revision: 11767

Modified:
   main/trunk/pym/portage/dbapi/vartree.py
Log:
Eliminate duplicate code by calling equivalent dblink._clear_contents_cac=
he().


Modified: main/trunk/pym/portage/dbapi/vartree.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- main/trunk/pym/portage/dbapi/vartree.py	2008-10-31 20:21:53 UTC (rev =
11766)
+++ main/trunk/pym/portage/dbapi/vartree.py	2008-10-31 20:40:51 UTC (rev =
11767)
@@ -3295,9 +3295,7 @@
 		# just been merged.
 		others_in_slot.append(self)  # self has just been merged
 		for dblnk in others_in_slot:
-			dblnk.contentscache =3D None
-			dblnk._contents_inodes =3D None
-			dblnk._contents_basenames =3D None
+			dblnk._clear_contents_cache()
=20
 		# If portage is reinstalling itself, remove the old
 		# version now since we want to use the temporary