From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 6 Dec 2008 22:34:13 +0000 (-0000)
Subject: Allow 'system' and 'world' arguments simultaneously since it doesn't hurt.
X-Git-Tag: v2.1.6~2
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7b9798ac894deda537c8d255c10edfa1d294a89a;p=portage.git

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 8126ae7b3..36670f69a 100644
--- 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):