From afc3eb95c68df684f24559febf7f40bc0f2501cc Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 27 Jun 2009 14:28:34 +0000
Subject: [PATCH]    Merged from trunk -r13673:13675

   | 13674   | Make the global "actions" variable a local inside            |
   | zmedico | parse_opts() since the name collision with the               |
   |         | _emerge.actions module triggers this traceback with          |
   |         | epydoc-3.0.1: Traceback (most recent call last): File        |
   |         | "/usr/bin/epydoc", line 13, in cli() File                    |
   |         | "/usr/lib/python2.6/site-packages/epydoc/cli.py", line 965,  |
   |         | in cli main(options, names) File                             |
   |         | "/usr/lib/python2.6/site-packages/epydoc/cli.py", line 757,  |
   |         | in main exclude_parse=exclude_parse) File                    |
   |         | "/usr/lib/python2.6/site-packages/epydoc/docbuilder.py",     |
   |         | line 235, in build_doc_index docindex = DocIndex(docs) File  |
   |         | "/usr/lib/python2.6/site-packages/epydoc/apidoc.py", line    |
   |         | 1715, in __init__ raise ValueError("All APIdocs passed to    |
   |         | DocIndexer " ValueError: All APIdocs passed to DocIndexer    |
   |         | must already have canonical names.                           |

   | 13675   | Fix import for split _emerge.MetadataRegen module.           |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=13712
---
 bin/egencache           |  4 ++--
 pym/_emerge/__init__.py | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/egencache b/bin/egencache
index 224a34be0..d04dec202 100755
--- a/bin/egencache
+++ b/bin/egencache
@@ -23,7 +23,7 @@ import logging
 import optparse
 import os
 import portage
-import _emerge
+from _emerge.MetadataRegen import MetadataRegen
 from portage.cache.cache_errors import CacheError, StatCollision
 from portage.util import writemsg_level
 from portage import cpv_getkey
@@ -124,7 +124,7 @@ class GenCache(object):
 		else:
 			self._cp_set = None
 			self._cp_missing = set()
-		self._regen = _emerge.MetadataRegen(portdb, cp_iter=cp_iter,
+		self._regen = MetadataRegen(portdb, cp_iter=cp_iter,
 			consumer=self._metadata_callback,
 			max_jobs=max_jobs, max_load=max_load)
 		self.returncode = os.EX_OK
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 0a7ba4d40..d4eb82947 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -58,13 +58,6 @@ from _emerge._flush_elog_mod_echo import _flush_elog_mod_echo
 from _emerge.is_valid_package_atom import is_valid_package_atom
 from _emerge.stdout_spinner import stdout_spinner
 
-
-actions = frozenset([
-"clean", "config", "depclean",
-"info", "list-sets", "metadata",
-"prune", "regen",  "search",
-"sync",  "unmerge", "version",
-])
 options=[
 "--ask",          "--alphabetical",
 "--buildpkg",     "--buildpkgonly",
@@ -456,7 +449,14 @@ def parse_opts(tmpcmdline, silent=False):
 	myopts = {}
 	myfiles=[]
 
-	global actions, options, shortmapping
+	global options, shortmapping
+
+	actions = frozenset([
+		"clean", "config", "depclean",
+		"info", "list-sets", "metadata",
+		"prune", "regen",  "search",
+		"sync",  "unmerge", "version",
+	])
 
 	longopt_aliases = {"--cols":"--columns", "--skip-first":"--skipfirst"}
 	argument_options = {
-- 
2.26.2