diff options
-rw-r--r-- | pym/_emerge/__init__.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index a0c7c7378..b72f964a4 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -12450,6 +12450,10 @@ def action_build(settings, trees, mtimedb, for opt in ("--skipfirst", "--ask", "--tree"): resume_opts.pop(opt, None) myopts.update(resume_opts) + + if "--debug" in myopts: + writemsg_level("myopts %s\n" % (myopts,)) + # Adjust config according to options of the command being resumed. for myroot in trees: mysettings = trees[myroot]["vartree"].settings @@ -12779,9 +12783,10 @@ def action_build(settings, trees, mtimedb, del mtimedb["resume"] mtimedb.commit() mtimedb["resume"]={} - # XXX: Stored as a list for backward compatibility. - mtimedb["resume"]["myopts"] = \ - [k for k in myopts if myopts[k] is True] + # Stored as a dict starting with portage-2.2_rc7, and supported + # by >=portage-2.1.3_rc8. Versions <portage-2.1.3_rc8 only support + # a list type for options. + mtimedb["resume"]["myopts"] = myopts.copy() # Convert Atom instances to plain str since the mtimedb loader # sets unpickler.find_global = None which causes unpickler.load() |