From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 3 Jul 2007 17:49:36 +0000 (-0000)
Subject: Fix --oneshot handling from the previous commit.
X-Git-Tag: v2.2_pre1~1091
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b03f47fe19f7884264d3bddf8f42165c580aa3d6;p=portage.git

Fix --oneshot handling from the previous commit.

svn path=/main/trunk/; revision=7139
---

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)