| 1 |
Author: zmedico |
| 2 |
Date: 2008-10-10 20:25:19 +0000 (Fri, 10 Oct 2008) |
| 3 |
New Revision: 11671 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Bug #241132 - Handle AmbiguousPackageName exceptions for atoms passed to the |
| 9 |
--info action. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-10-10 20:15:43 UTC (rev 11670) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-10-10 20:25:19 UTC (rev 11671) |
| 16 |
@@ -13983,10 +13983,6 @@ |
| 17 |
elif "config"==myaction: |
| 18 |
validate_ebuild_environment(trees) |
| 19 |
action_config(settings, trees, myopts, myfiles) |
| 20 |
- |
| 21 |
- # INFO action |
| 22 |
- elif "info"==myaction: |
| 23 |
- action_info(settings, trees, myopts, myfiles) |
| 24 |
|
| 25 |
# SEARCH action |
| 26 |
elif "search"==myaction: |
| 27 |
@@ -14018,7 +14014,7 @@ |
| 28 |
if not (buildpkgonly or fetchonly or pretend): |
| 29 |
post_emerge(root_config, myopts, mtimedb, os.EX_OK) |
| 30 |
|
| 31 |
- elif myaction in ("depclean", "prune"): |
| 32 |
+ elif myaction in ("depclean", "info", "prune"): |
| 33 |
|
| 34 |
# Ensure atoms are valid before calling unmerge(). |
| 35 |
vardb = trees[settings["ROOT"]]["vartree"].dbapi |
| 36 |
@@ -14049,6 +14045,9 @@ |
| 37 |
level=logging.ERROR, noiselevel=-1) |
| 38 |
return 1 |
| 39 |
|
| 40 |
+ if myaction == "info": |
| 41 |
+ return action_info(settings, trees, myopts, valid_atoms) |
| 42 |
+ |
| 43 |
validate_ebuild_environment(trees) |
| 44 |
action_depclean(settings, trees, mtimedb["ldpath"], |
| 45 |
myopts, myaction, valid_atoms, spinner) |
Archives