diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-11-17 15:10:13 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-11-17 15:10:13 -0800 |
| commit | d3f704a425a50b5cfa997a25866929b30f1b7d0f (patch) | |
| tree | 9fca880b3d95fd59b7ebf98ee0483f8890bbe171 /pym/_emerge/resolver | |
| parent | c2b1353843af26ffbad8b9f95533e4c691c93443 (diff) | |
| download | portage-d3f704a425a50b5cfa997a25866929b30f1b7d0f.tar.gz portage-d3f704a425a50b5cfa997a25866929b30f1b7d0f.tar.bz2 portage-d3f704a425a50b5cfa997a25866929b30f1b7d0f.zip | |
Skip the "resume after portage update" routine.
Instead, finish the whole job using a copy of the currently running
instance. This allows us to avoid the complexities of emerge --resume,
such as the differences in option handling between different portage
versions, as reported in bug #390819.
Diffstat (limited to 'pym/_emerge/resolver')
| -rw-r--r-- | pym/_emerge/resolver/output.py | 21 | ||||
| -rw-r--r-- | pym/_emerge/resolver/output_helpers.py | 1 |
2 files changed, 0 insertions, 22 deletions
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index eed30190d..6f1c76c43 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -865,27 +865,6 @@ class Display(object): continue self.print_msg.append((myprint, self.verboseadd, self.repoadd)) - if not self.conf.tree_display \ - and not self.conf.no_restart \ - and pkg.root == self.conf.running_root.root \ - and match_from_list(PORTAGE_PACKAGE_ATOM, [pkg]) \ - and not self.conf.quiet: - - if not self.vardb.cpv_exists(pkg.cpv) or \ - '9999' in pkg.cpv or \ - 'git' in pkg.inherited or \ - 'git-2' in pkg.inherited: - if mylist_index < len(mylist) - 1: - self.print_msg.append( - colorize( - "WARN", "*** Portage will stop merging " - "at this point and reload itself," - ) - ) - self.print_msg.append( - colorize("WARN", " then resume the merge.") - ) - show_repos = repoadd_set and repoadd_set != set(["0"]) # now finally print out the messages diff --git a/pym/_emerge/resolver/output_helpers.py b/pym/_emerge/resolver/output_helpers.py index b3cdbc4c4..dd26534f8 100644 --- a/pym/_emerge/resolver/output_helpers.py +++ b/pym/_emerge/resolver/output_helpers.py @@ -198,7 +198,6 @@ class _DisplayConfig(object): self.print_use_string = self.verbosity != 1 or "--verbose" in frozen_config.myopts self.changelog = "--changelog" in frozen_config.myopts self.edebug = frozen_config.edebug - self.no_restart = frozen_config._opts_no_restart.intersection(frozen_config.myopts) self.unordered_display = "--unordered-display" in frozen_config.myopts mywidth = 130 |