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 0d14107cb366b9190108319be24a1581b33174a6..e0e66d8ac783e5c56fbab697c24c9c11f87eb422 100644 (file)
--- 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