diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2021-05-01 15:23:39 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2021-05-01 15:27:41 -0700 |
| commit | 1eda52d380b39095c6471db8025ab2202fedafc9 (patch) | |
| tree | e3f2451899f45db28945d3f3025ee1ba91399a7a | |
| parent | ebuild.5: Add eapply documentation (diff) | |
| download | portage-1eda52d380b39095c6471db8025ab2202fedafc9.tar.gz portage-1eda52d380b39095c6471db8025ab2202fedafc9.tar.bz2 portage-1eda52d380b39095c6471db8025ab2202fedafc9.zip | |
_run_pkg_pretend: raise asyncio.CancelledError when terminated
Bug: https://bugs.gentoo.org/787545
Signed-off-by: Zac Medico <zmedico@gentoo.org>
| -rw-r--r-- | lib/_emerge/Scheduler.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py index 0ed2ee530..656d382dd 100644 --- a/lib/_emerge/Scheduler.py +++ b/lib/_emerge/Scheduler.py @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 from collections import deque @@ -791,6 +791,10 @@ class Scheduler(PollScheduler): if "pretend" not in x.defined_phases: continue + self._termination_check() + if self._terminated_tasks: + raise asyncio.CancelledError + out_str = "Running pre-merge checks for " + colorize("INFORM", x.cpv) self._status_msg(out_str) |