Allow 'system' and 'world' arguments simultaneously since it doesn't hurt.

svn path=/main/branches/2.1.6/; revision=12173

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 8126ae7b3094579d0cf8075319176324ebb2c81a..36670f69a2370df7dec928d58f0addc84053e2b7 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -13600,10 +13600,6 @@ def expand_set_arguments(myfiles, myaction, root_config):
                                multiple_actions("world", myaction)
                                return (myfiles, 1)
 
-               if system and world:
-                       multiple_actions("system", "world")
-                       return (myfiles, 1)
-
        return (myfiles, os.EX_OK)
 
 def repo_name_check(trees):