diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-07-04 09:25:43 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-07-04 09:25:43 +0000 |
| commit | 167074f94b2682d4d3e9bd8a664134b28da39c6a (patch) | |
| tree | b3da444c0d6625de3d4b311c4b984c541ec76068 | |
| parent | 222d4a70247d3be8f58152e4a68b5b9220092217 (diff) | |
| download | portage-167074f94b2682d4d3e9bd8a664134b28da39c6a.tar.gz portage-167074f94b2682d4d3e9bd8a664134b28da39c6a.tar.bz2 portage-167074f94b2682d4d3e9bd8a664134b28da39c6a.zip | |
Don't pass myopts into profile_check() since it's no longer needed. Thanks to
Radchenko <slonopotamusorama@gmail.com> for this patch.
svn path=/main/trunk/; revision=13775
| -rw-r--r-- | pym/_emerge/main.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 51357bde2..ed24774a9 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -865,10 +865,8 @@ def config_protect_check(trees): msg += " for '%s'" % root writemsg_level(msg, level=logging.WARN, noiselevel=-1) -def profile_check(trees, myaction, myopts): - if myaction in ("help", "info", "sync"): - return os.EX_OK - elif "--version" in myopts: +def profile_check(trees, myaction): + if myaction in ("help", "info", "sync", "version"): return os.EX_OK for root, root_trees in trees.iteritems(): if root_trees["root_config"].settings.profiles: @@ -906,7 +904,7 @@ def emerge_main(): os.umask(022) settings, trees, mtimedb = load_emerge_config() portdb = trees[settings["ROOT"]]["porttree"].dbapi - rval = profile_check(trees, myaction, myopts) + rval = profile_check(trees, myaction) if rval != os.EX_OK: return rval |