From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 5 Aug 2009 04:59:10 +0000 (-0000)
Subject: Fix insert_optional_args() to properly handle thinks like -Dk which require
X-Git-Tag: v2.2_rc37~45
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1689682296b3ad9750ca1432f1255e9798900353;p=portage.git

Fix insert_optional_args() to properly handle thinks like -Dk which require
multiple substitutions of default arguments.

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

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 0d14107cb..e0e66d8ac 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -474,7 +474,9 @@ def insert_optional_args(args):
 			new_args.append(opt_arg)
 
 		if saved_opts is not None:
-			new_args.append("-" + saved_opts)
+			# Recycle these on arg_stack since they
+			# might contain another match.
+			arg_stack.append("-" + saved_opts)
 
 	return new_args