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

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 51357bde2105c686dc658bd13292364ee9e59ef9..ed24774a9a74ca845b81970e337d899ad231c502 100644 (file)
--- 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