| 1 |
Author: grobian |
| 2 |
Date: 2009-06-27 14:28:34 +0000 (Sat, 27 Jun 2009) |
| 3 |
New Revision: 13712 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/bin/egencache |
| 7 |
main/branches/prefix/pym/_emerge/__init__.py |
| 8 |
Log: |
| 9 |
Merged from trunk -r13673:13675 |
| 10 |
|
| 11 |
| 13674 | Make the global "actions" variable a local inside | |
| 12 |
| zmedico | parse_opts() since the name collision with the | |
| 13 |
| | _emerge.actions module triggers this traceback with | |
| 14 |
| | epydoc-3.0.1: Traceback (most recent call last): File | |
| 15 |
| | "/usr/bin/epydoc", line 13, in cli() File | |
| 16 |
| | "/usr/lib/python2.6/site-packages/epydoc/cli.py", line 965, | |
| 17 |
| | in cli main(options, names) File | |
| 18 |
| | "/usr/lib/python2.6/site-packages/epydoc/cli.py", line 757, | |
| 19 |
| | in main exclude_parse=exclude_parse) File | |
| 20 |
| | "/usr/lib/python2.6/site-packages/epydoc/docbuilder.py", | |
| 21 |
| | line 235, in build_doc_index docindex = DocIndex(docs) File | |
| 22 |
| | "/usr/lib/python2.6/site-packages/epydoc/apidoc.py", line | |
| 23 |
| | 1715, in __init__ raise ValueError("All APIdocs passed to | |
| 24 |
| | DocIndexer " ValueError: All APIdocs passed to DocIndexer | |
| 25 |
| | must already have canonical names. | |
| 26 |
|
| 27 |
| 13675 | Fix import for split _emerge.MetadataRegen module. | |
| 28 |
| zmedico | | |
| 29 |
|
| 30 |
|
| 31 |
Modified: main/branches/prefix/bin/egencache |
| 32 |
=================================================================== |
| 33 |
--- main/branches/prefix/bin/egencache 2009-06-27 14:24:48 UTC (rev 13711) |
| 34 |
+++ main/branches/prefix/bin/egencache 2009-06-27 14:28:34 UTC (rev 13712) |
| 35 |
@@ -23,7 +23,7 @@ |
| 36 |
import optparse |
| 37 |
import os |
| 38 |
import portage |
| 39 |
-import _emerge |
| 40 |
+from _emerge.MetadataRegen import MetadataRegen |
| 41 |
from portage.cache.cache_errors import CacheError, StatCollision |
| 42 |
from portage.util import writemsg_level |
| 43 |
from portage import cpv_getkey |
| 44 |
@@ -124,7 +124,7 @@ |
| 45 |
else: |
| 46 |
self._cp_set = None |
| 47 |
self._cp_missing = set() |
| 48 |
- self._regen = _emerge.MetadataRegen(portdb, cp_iter=cp_iter, |
| 49 |
+ self._regen = MetadataRegen(portdb, cp_iter=cp_iter, |
| 50 |
consumer=self._metadata_callback, |
| 51 |
max_jobs=max_jobs, max_load=max_load) |
| 52 |
self.returncode = os.EX_OK |
| 53 |
|
| 54 |
Modified: main/branches/prefix/pym/_emerge/__init__.py |
| 55 |
=================================================================== |
| 56 |
--- main/branches/prefix/pym/_emerge/__init__.py 2009-06-27 14:24:48 UTC (rev 13711) |
| 57 |
+++ main/branches/prefix/pym/_emerge/__init__.py 2009-06-27 14:28:34 UTC (rev 13712) |
| 58 |
@@ -58,13 +58,6 @@ |
| 59 |
from _emerge.is_valid_package_atom import is_valid_package_atom |
| 60 |
from _emerge.stdout_spinner import stdout_spinner |
| 61 |
|
| 62 |
- |
| 63 |
-actions = frozenset([ |
| 64 |
-"clean", "config", "depclean", |
| 65 |
-"info", "list-sets", "metadata", |
| 66 |
-"prune", "regen", "search", |
| 67 |
-"sync", "unmerge", "version", |
| 68 |
-]) |
| 69 |
options=[ |
| 70 |
"--ask", "--alphabetical", |
| 71 |
"--buildpkg", "--buildpkgonly", |
| 72 |
@@ -456,8 +449,15 @@ |
| 73 |
myopts = {} |
| 74 |
myfiles=[] |
| 75 |
|
| 76 |
- global actions, options, shortmapping |
| 77 |
+ global options, shortmapping |
| 78 |
|
| 79 |
+ actions = frozenset([ |
| 80 |
+ "clean", "config", "depclean", |
| 81 |
+ "info", "list-sets", "metadata", |
| 82 |
+ "prune", "regen", "search", |
| 83 |
+ "sync", "unmerge", "version", |
| 84 |
+ ]) |
| 85 |
+ |
| 86 |
longopt_aliases = {"--cols":"--columns", "--skip-first":"--skipfirst"} |
| 87 |
argument_options = { |
| 88 |
"--config-root": { |
Archives