From b03f47fe19f7884264d3bddf8f42165c580aa3d6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 3 Jul 2007 17:49:36 +0000 Subject: Fix --oneshot handling from the previous commit. svn path=/main/trunk/; revision=7139 --- pym/emerge/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pym') 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) -- cgit v1.2.3-1-g7c22