From: Zac Medico Date: Sun, 22 Jul 2007 06:48:00 +0000 (-0000) Subject: Make --update imply --oneshot since people often us it to update things when they... X-Git-Tag: v2.2_pre1~971 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ed6b9d621e14b1c374653eace671f08b74285fc2;p=portage.git Make --update imply --oneshot since people often us it to update things when they don't want to add them to world. Thanks to jakub for the suggestion. svn path=/main/trunk/; revision=7349 --- diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 40c9151f6..d40957f9c 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -1568,7 +1568,9 @@ class depgraph(object): 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"]