From a2e290674596382f1279d6dec83a43d1b78c9cd8 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 2 Mar 2010 20:19:57 +0000 Subject: Make sure that config._accept_chost() accepts empty CHOST. (trunk r15354) svn path=/main/branches/2.1.7/; revision=15581 --- pym/portage/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 1330263cb..1afb46ba0 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -3242,8 +3242,9 @@ class config(object): (" ".join(accept_chost), e), noiselevel=-1) self._accept_chost_re = re.compile("^$") - return self._accept_chost_re.match( - metadata.get('CHOST', '')) is not None + pkg_chost = metadata.get('CHOST', '') + return not pkg_chost or \ + self._accept_chost_re.match(pkg_chost) is not None def setinst(self,mycpv,mydbapi): """This updates the preferences for old-style virtuals, -- cgit v1.2.3-1-g7c22