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-99861-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1Kvz3b-0004C8-JE
	for garchives@archives.gentoo.org; Fri, 31 Oct 2008 18:49:15 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id D0E78E047C;
	Fri, 31 Oct 2008 18:49:14 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id A3E32E047C
	for <gentoo-commits@lists.gentoo.org>; Fri, 31 Oct 2008 18:49:14 +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 C999064203
	for <gentoo-commits@lists.gentoo.org>; Fri, 31 Oct 2008 18:49:11 +0000 (UTC)
Received: from zmedico by stork.gentoo.org with local (Exim 4.69)
	(envelope-from <zmedico@stork.gentoo.org>)
	id 1Kvz3X-0006el-Et
	for gentoo-commits@lists.gentoo.org; Fri, 31 Oct 2008 18:49:11 +0000
To: gentoo-commits@lists.gentoo.org
From: "Zac Medico (zmedico)" <zmedico@gentoo.org>
Subject: [gentoo-commits] portage r11765 - main/trunk/pym/portage/dbapi
X-VCS-Repository: portage
X-VCS-Revision: 11765
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: <E1Kvz3X-0006el-Et@stork.gentoo.org>
Sender: Zac Medico <zmedico@stork.gentoo.org>
Date: Fri, 31 Oct 2008 18:49:11 +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: f85273c5-e2e3-4b91-baec-b01c36825576
X-Archives-Hash: fad763a325e6e65c5b468309edb9bb83

Author: zmedico
Date: 2008-10-31 18:49:10 +0000 (Fri, 31 Oct 2008)
New Revision: 11765

Modified:
   main/trunk/pym/portage/dbapi/vartree.py
Log:
In dblink._collision_protect(), remove redundant self.isowner() calls sin=
ce
self hasn't yet been merged and therefore has no CONTENTS file for owners=
hip
checks. Also, remove redundant isprotected() calls.


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 17:25:44 UTC (rev =
11764)
+++ main/trunk/pym/portage/dbapi/vartree.py	2008-10-31 18:49:10 UTC (rev =
11765)
@@ -2734,10 +2734,12 @@
 					f=3D"/"+f
 				isowned =3D False
 				full_path =3D os.path.join(destroot, f.lstrip(os.path.sep))
-				for ver in [self] + mypkglist:
-					if (ver.isowner(f, destroot) or ver.isprotected(full_path)):
+				for ver in mypkglist:
+					if ver.isowner(f, destroot):
 						isowned =3D True
 						break
+				if not isowned and self.isprotected(full_path):
+					isowned =3D True
 				if not isowned:
 					stopmerge =3D True
 					if collision_ignore: