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 f3d6d95f1da95729bf0e7384b30276453bfdc314..535dd10766bfbd1feaa37496d49864bed63b84a5 100755 (executable)
--- 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"]