summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-07-22 06:48:00 +0000
committerZac Medico <zmedico@gentoo.org>2007-07-22 06:48:00 +0000
commited6b9d621e14b1c374653eace671f08b74285fc2 (patch)
treede229a4e36c3c7e69dc189cfdc8849bc9cbe9522
parent7f666283b970518d97cf3a657b4150392c54cecc (diff)
downloadportage-ed6b9d621e14b1c374653eace671f08b74285fc2.tar.gz
portage-ed6b9d621e14b1c374653eace671f08b74285fc2.tar.bz2
portage-ed6b9d621e14b1c374653eace671f08b74285fc2.zip
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
-rw-r--r--pym/emerge/__init__.py4
1 files changed, 3 insertions, 1 deletions
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"]