Make sure that config._accept_chost() accepts empty CHOST. (trunk r15354)

svn path=/main/branches/2.1.7/; revision=15581

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 1330263cb00b6f567a91e3f88ebbb10ca333df6b..1afb46ba095503b665b22400d52e5eb708d4c8e2 100644 (file)
--- 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,