summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-11 06:38:28 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-11 06:38:28 +0000
commit1fe1c832f1c4dc9933714ea676ca5afecdf1377a (patch)
treecfd04c7383145c356cd7fb5f10b2372aabc45882
parentcd2e8987d498d77758ae59d5a7a4deb5ae36b961 (diff)
downloadportage-1fe1c832f1c4dc9933714ea676ca5afecdf1377a.tar.gz
portage-1fe1c832f1c4dc9933714ea676ca5afecdf1377a.tar.bz2
portage-1fe1c832f1c4dc9933714ea676ca5afecdf1377a.zip
Make --version and action. (trunk r12752)
svn path=/main/branches/2.1.6/; revision=13000
-rw-r--r--pym/_emerge/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 6431edc26..846bde7b1 100644
--- 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)