| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 07:01:03 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13473 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Bug #265111 - Make current options override older options for --resume. |
| 9 |
(trunk r13302) |
| 10 |
|
| 11 |
Modified: main/branches/2.1.6/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 07:00:47 UTC (rev 13472) |
| 14 |
+++ main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 07:01:03 UTC (rev 13473) |
| 15 |
@@ -14116,6 +14116,10 @@ |
| 16 |
resume_opts = dict((k,True) for k in resume_opts) |
| 17 |
for opt in ("--ask", "--color", "--skipfirst", "--tree"): |
| 18 |
resume_opts.pop(opt, None) |
| 19 |
+ |
| 20 |
+ # Current options always override resume_opts. |
| 21 |
+ resume_opts.update(myopts) |
| 22 |
+ myopts.clear() |
| 23 |
myopts.update(resume_opts) |
| 24 |
|
| 25 |
if "--debug" in myopts: |
Archives