From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 26 Sep 2007 04:20:22 +0000 (-0000)
Subject: Bug #190781 - Don't include --oneshot in the options that
X-Git-Tag: v2.1.3.16~125
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=977598fd054ef4e9349e7ca8ea648ebd7dfb7663;p=portage.git

Bug #190781 - Don't include --oneshot in the options that
--update implies. (trunk r7790)

svn path=/main/branches/2.1.2/; revision=7821
---

diff --git a/bin/emerge b/bin/emerge
index f3d6d95f1..535dd1076 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1643,8 +1643,7 @@ class depgraph:
 			arg_atoms = greedy_atoms
 
 		oneshot = "--oneshot" in self.myopts or \
-			"--onlydeps" in self.myopts or \
-			"--update" in self.myopts
+			"--onlydeps" in self.myopts
 		""" These are used inside self.create() in order to ensure packages
 		that happen to match arguments are not incorrectly marked as nomerge."""
 		args_set = self._sets["args"]