From 9889f355d890f0ad6e604f0064c2459273af35a4 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 14 Feb 2010 05:56:34 +0000 Subject: Prevent CHOST vdb entries from being created for virtual packages. svn path=/main/trunk/; revision=15353 --- pym/portage/__init__.py | 3 +++ pym/portage/dbapi/vartree.py | 7 +++++++ 2 files changed, 10 insertions(+) (limited to 'pym') diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index d7f3a7fb3..e3e484fb1 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 48d58350e..e0dd4a707 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3448,6 +3448,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), -- cgit v1.2.3-1-g7c22