From: Zac Medico Date: Sat, 4 Jul 2009 09:25:43 +0000 (-0000) Subject: Don't pass myopts into profile_check() since it's no longer needed. Thanks to X-Git-Tag: v2.2_rc34~87 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=167074f94b2682d4d3e9bd8a664134b28da39c6a;p=portage.git Don't pass myopts into profile_check() since it's no longer needed. Thanks to Radchenko for this patch. svn path=/main/trunk/; revision=13775 --- 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