Make --version and action. (trunk r12752)

svn path=/main/branches/2.1.6/; revision=13000

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 6431edc26bc352987aa7c056c709b76deb377b5f..846bde7b1cde26e5249b2b2f9fa7a6343e666046 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -186,7 +186,7 @@ actions = frozenset([
 "clean", "config", "depclean",
 "info", "metadata",
 "prune", "regen",  "search",
-"sync",  "unmerge",
+"sync",  "unmerge", "version",
 ])
 options=[
 "--ask",          "--alphabetical",
@@ -211,7 +211,7 @@ options=[
 "--tree",
 "--update",
 "--usepkg",       "--usepkgonly",
-"--verbose",      "--version"
+"--verbose",
 ]
 
 shortmapping={
@@ -14948,7 +14948,7 @@ def emerge_main():
                if not sys.stdout.isatty() or ("--nospinner" in myopts):
                        spinner.update = spinner.update_basic
 
-       if "--version" in myopts:
+       if myaction == 'version':
                print getportageversion(settings["PORTDIR"], settings["ROOT"],
                        settings.profile_path, settings["CHOST"],
                        trees[settings["ROOT"]]["vartree"].dbapi)