From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 5 Mar 2009 03:43:03 +0000 (-0000)
Subject: Make --version and action.
X-Git-Tag: v2.2_rc24~63
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=31b309b1c91e66e9a8cff953f128b03483d93ae4;p=portage.git

Make --version and action.

svn path=/main/trunk/; revision=12752
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index a53d58a8f..4f4ed1e1c 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -186,7 +186,7 @@ actions = frozenset([
 "clean", "config", "depclean",
 "info", "list-sets", "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={
@@ -15439,7 +15439,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)