Make --update imply --oneshot since people often us it to update things when they...

svn path=/main/branches/2.1.2/; revision=7350

diff --git a/bin/emerge b/bin/emerge
index 84cd16a5db3b947f665f73b89fee679f73a8873a..988580c4369f477010e6194258f46fcb547aed53 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1650,7 +1650,9 @@ class depgraph:
                                                        greedy_atoms.append((myarg, myslot_atom))
                        arg_atoms = greedy_atoms
 
-               oneshot = "--oneshot" in self.myopts or "--onlydeps" in self.myopts
+               oneshot = "--oneshot" in self.myopts or \
+                       "--onlydeps" in self.myopts or \
+                       "--update" 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"]