commit: 646c400e018422be4ff165d73a2f18d1a9e987a5 Author: Felix Bier <flx.bier <AT> gmail <DOT> com> AuthorDate: Sun May 9 21:51:37 2021 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Mon May 24 06:30:26 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=646c400e
unmerge: Reuse helper variable quiet This commit reuses the already existing helper variable quiet to avoid rechecking if --quiet is contained in myopts. Signed-off-by: Felix Bier <felix.bier <AT> rohde-schwarz.com> Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/_emerge/unmerge.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/_emerge/unmerge.py b/lib/_emerge/unmerge.py index 09e155de3..b0067f8e6 100644 --- a/lib/_emerge/unmerge.py +++ b/lib/_emerge/unmerge.py @@ -166,15 +166,14 @@ def _unmerge_display(root_config, myopts, unmerge_action, "="+"/".join(sp_absx[sp_vdb_len:])) newline="" - if not "--quiet" in myopts: + if not quiet: newline="\n" if settings["ROOT"] != "/": writemsg_level(darkgreen(newline+ \ ">>> Using system located in ROOT tree %s\n" % \ settings["ROOT"])) - if (("--pretend" in myopts) or ("--ask" in myopts)) and \ - not "--quiet" in myopts: + if ("--pretend" in myopts or "--ask" in myopts) and not quiet: writemsg_level(darkgreen(newline+\ ">>> These are the packages that would be unmerged:\n"))