From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 2 Mar 2010 20:17:52 +0000 (-0000)
Subject: Prevent CHOST vdb entries from being created for virtual packages.
X-Git-Tag: v2.1.8~142
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=15f89bc7b22ce7a02db1cf740ce10a550ea81dbb;p=portage.git

Prevent CHOST vdb entries from being created for virtual packages.
(trunk r15353)

svn path=/main/branches/2.1.7/; revision=15580
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 32a7902d3..1330263cb 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -5865,6 +5865,9 @@ def _post_src_install_chost_fix(settings):
 	CHOST variable, so revert it to the initial
 	setting.
 	"""
+	if settings.get('CATEGORY') == 'virtual':
+		return
+
 	chost = settings.get('CHOST')
 	if chost:
 		write_atomic(os.path.join(settings['PORTAGE_BUILDDIR'],
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 8f53b1f98..c2885b15c 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2336,6 +2336,13 @@ class dblink(object):
 
 		slot = ''
 		for var_name in ('CHOST', 'SLOT'):
+			if var_name == 'CHOST' and self.cat == 'virtual':
+				try:
+					os.unlink(os.path.join(inforoot, var_name))
+				except OSError:
+					pass
+				continue
+
 			try:
 				val = codecs.open(_unicode_encode(
 					os.path.join(inforoot, var_name),