From: Justin Riley (home key) <justin.t.riley@gmail.com>
Date: Sun, 5 Jun 2011 22:37:56 +0000 (-0400)
Subject: Apply Justin Riley's ACCEPT_KEYWORDS patch.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=68661226e9031f32814beee4cd8215404e8cb459;p=g-pypi.git

Apply Justin Riley's ACCEPT_KEYWORDS patch.

Excerpts from Justin's comments [1]:

At least for Portage 2.1.4.4, /usr/lib64/portage/pym/portage.py's
config class specifically excludes ACCEPT_KEYWORDS. Therefore,
  ENV = portage_config(clone=portage_settings).environ()
will never contain ACCEPT_KEYWORDS argument and the arch will always
be ~x86 as the result of get_keyword().

...

After looking at the code, it appears that the PORTAGE_CONFIG variable
introduced in the previous patch can completely replace ENV.  Here's
the patch that simply changes:

  ENV = portage_config(clone=portage_settings).environ()

to

  ENV = portage_config(clone=portage_settings)

[1]: http://code.google.com/p/g-pypi/issues/detail?id=4
---

diff --git a/g_pypi/portage_utils.py b/g_pypi/portage_utils.py
index 94b09b7..7bca6d3 100644
--- a/g_pypi/portage_utils.py
+++ b/g_pypi/portage_utils.py
@@ -33,7 +33,7 @@ import gentoolkit.query
 
 __docformat__ = 'restructuredtext'
 
-ENV = portage_config(clone=portage_settings).environ()
+ENV = portage_config(clone=portage_settings)
 LOGGER = logging.getLogger(__name__)
 LOGGER.setLevel(logging.DEBUG)
 LOGGER.addHandler(logging.StreamHandler())