summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-07-03 17:49:36 +0000
committerZac Medico <zmedico@gentoo.org>2007-07-03 17:49:36 +0000
commitb03f47fe19f7884264d3bddf8f42165c580aa3d6 (patch)
tree2bfc76858c5c17fc50a8f9f8c18efd688832bf6e
parent777e55a949feae0144b8ab2459d285bc0138f671 (diff)
downloadportage-b03f47fe19f7884264d3bddf8f42165c580aa3d6.tar.gz
portage-b03f47fe19f7884264d3bddf8f42165c580aa3d6.tar.bz2
portage-b03f47fe19f7884264d3bddf8f42165c580aa3d6.zip
Fix --oneshot handling from the previous commit.
svn path=/main/trunk/; revision=7139
-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 8d3432987..27c1645e6 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -1551,13 +1551,15 @@ class depgraph(object):
greedy_atoms.append((myarg, myslot_atom))
arg_atoms = greedy_atoms
+ oneshot = "--oneshot" 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."""
for myarg, myatom in arg_atoms:
if myatom in self._args_atoms:
continue
self._args_atoms.add(myatom)
- myfavorites.append(myatom)
+ if not oneshot:
+ myfavorites.append(myatom)
for myarg, myatom in arg_atoms:
try:
self.mysd = self.select_dep(myroot, myatom, arg=myarg)