For bug #176384, adjust config according to options of the command being resumed...

svn path=/main/branches/2.1.2/; revision=6455

diff --git a/bin/emerge b/bin/emerge
index 0e40a955da857a0f6e51fc88f95dacd815b3bc1f..c5c7845a022f71eb3f2ae00dfcc0dd8461637d7c 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -4783,6 +4783,15 @@ def action_build(settings, trees, mtimedb,
                        if myopt not in myresumeopts:
                                myresumeopts[myopt] = myarg
                myopts=myresumeopts
+
+               # Adjust config according to options of the command being resumed.
+               for myroot in trees:
+                       mysettings =  trees[myroot]["vartree"].settings
+                       mysettings.unlock()
+                       adjust_config(myopts, mysettings)
+                       mysettings.lock()
+                       del myroot, mysettings
+
                myparams = create_depgraph_params(myopts, myaction)
                if "--quiet" not in myopts and "--nodeps" not in myopts:
                        print "Calculating dependencies  ",