diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-04-08 20:23:55 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-04-08 20:23:55 +0000 |
| commit | 3e20a783357886cb187eb33fe58e9dcab436f7bc (patch) | |
| tree | 7e04e1b29789056fdac88d8a871893fa1438bfcc | |
| parent | ef73cc3a1f0a27b1d31a1b664cd155556998abbd (diff) | |
| download | portage-3e20a783357886cb187eb33fe58e9dcab436f7bc.tar.gz portage-3e20a783357886cb187eb33fe58e9dcab436f7bc.tar.bz2 portage-3e20a783357886cb187eb33fe58e9dcab436f7bc.zip | |
Bug #265111 - Make current options override older options for --resume.
svn path=/main/trunk/; revision=13302
| -rw-r--r-- | pym/_emerge/__init__.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 0b5a3a69a..11ad3fae1 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -14470,6 +14470,10 @@ def action_build(settings, trees, mtimedb, resume_opts = dict((k,True) for k in resume_opts) for opt in ("--ask", "--color", "--skipfirst", "--tree"): resume_opts.pop(opt, None) + + # Current options always override resume_opts. + resume_opts.update(myopts) + myopts.clear() myopts.update(resume_opts) if "--debug" in myopts: |