On Fri, 2020-08-07 at 12:28 -0400, Aaron Bauman wrote:
> * Python implies such things. Let's drop 'em and be consistent.
>
> Signed-off-by: Aaron Bauman
> ---
> "\\" | 20
> lib/_emerge/EbuildPhase.py | 6 +++---
> lib/_emerge/resolver/output.py | 5 -
> lib/portage/elog/mod_custom.py | 1 -
> lib/portage/elog/mod_echo.py | 4 ++--
> lib/portage/elog/mod_mail.py | 2 --
> lib/portage/glsa.py| 3 ---
> lib/portage/mail.py| 1 -
> lib/portage/sync/controller.py | 3 +--
> lib/portage/util/whirlpool.py | 2 --
> pylintrc | 1 +
> 11 files changed, 27 insertions(+), 21 deletions(-)
> create mode 100644 "\\"
>
> diff --git "a/\\" "b/\\"
> new file mode 100644
> index 0..aaf1d3b1b
> --- /dev/null
> +++ "b/\\"
That's an interesting file to add.
> @@ -0,0 +1,20 @@
> +# elog/mod_custom.py - elog dispatch module
> +# Copyright 2006-2020 Gentoo Authors
> +# Distributed under the terms of the GNU General Public License v2
> +
> +import portage.elog.mod_save
> +import portage.exception
> +import portage.process
> +
> +def process(mysettings, key, logentries, fulltext):
> + elogfilename = portage.elog.mod_save.process(mysettings, key,
> logentries, fulltext)
> +
> + if not mysettings.get("PORTAGE_ELOG_COMMAND"):
> + raise portage.exception.MissingParameter("!!! Custom logging
> requested but PORTAGE_ELOG_COMMAND is not defined")
> + else:
> + mylogcmd = mysettings["PORTAGE_ELOG_COMMAND"]
> + mylogcmd = mylogcmd.replace("${LOGFILE}", elogfilename)
> + mylogcmd = mylogcmd.replace("${PACKAGE}", key)
> + retval = portage.process.spawn_bash(mylogcmd)
> + if retval != 0:
> + raise portage.exception.PortageException("!!!
> PORTAGE_ELOG_COMMAND failed with exitcode %d" % retval)
> diff --git a/lib/_emerge/EbuildPhase.py b/lib/_emerge/EbuildPhase.py
> index e6256d0aa..ceffeccee 100644
> --- a/lib/_emerge/EbuildPhase.py
> +++ b/lib/_emerge/EbuildPhase.py
> @@ -9,11 +9,12 @@ import tempfile
>
> from _emerge.AsynchronousLock import AsynchronousLock
> from _emerge.BinpkgEnvExtractor import BinpkgEnvExtractor
> -from _emerge.MiscFunctionsProcess import MiscFunctionsProcess
> -from _emerge.EbuildProcess import EbuildProcess
> from _emerge.CompositeTask import CompositeTask
> +from _emerge.EbuildProcess import EbuildProcess
> +from _emerge.MiscFunctionsProcess import MiscFunctionsProcess
> from _emerge.PackagePhase import PackagePhase
> from _emerge.TaskSequence import TaskSequence
> +
> from portage.package.ebuild._ipc.QueryCommand import QueryCommand
> from portage.util._dyn_libs.soname_deps_qa import (
> _get_all_provides,
> @@ -396,7 +397,6 @@ class EbuildPhase(CompositeTask):
> fd_pipes=self.fd_pipes, phase=phase,
> scheduler=self.scheduler,
> settings=self.settings)
> self._start_task(clean_phase, self._fail_clean_exit)
> - return
>
> def _fail_clean_exit(self, clean_phase):
> self._final_exit(clean_phase)
> diff --git a/lib/_emerge/resolver/output.py b/lib/_emerge/resolver/output.py
> index 1dcb47020..b6c77ecad 100644
> --- a/lib/_emerge/resolver/output.py
> +++ b/lib/_emerge/resolver/output.py
> @@ -243,7 +243,6 @@ class Display:
> cur_use_map[key], old_iuse_map[key],
> old_use_map[key], is_new, feature_flags,
> reinst_flags_map.get(key))
> - return
>
>
> @staticmethod
> @@ -539,7 +538,6 @@ class Display:
> if show_repos and repoadd:
> myprint += " " + teal("[%s]" % repoadd)
> writemsg_stdout("%s\n" % (myprint,), noiselevel=-1)
> - return
>
>
> def print_blockers(self):
> @@ -548,7 +546,6 @@ class Display:
> """
> for pkg in self.blockers:
> writemsg_stdout("%s\n" % (pkg,), noiselevel=-1)
> - return
>
>
> def print_verbose(self, show_repos):
> @@ -562,7 +559,6 @@ class Display:
> # that RepoDisplay.__unicode__() is called in python2.
> writemsg_stdout("%s" % (self.conf.repo_display,),
> noiselevel=-1)
> - return
>
>
> def print_changelog(self):
> @@ -687,7 +683,6 @@ class Display:
> if ebuild_path_cl is not None:
> self.changelogs.extend(_calc_changelog(
> ebuild_path_cl, pkg_info.previous_pkg,
> pkg.cpv))
> - return
>
>
> def check_system_world(self, pkg):
> diff --git a/lib/portage/elog/mod_custom.py b/lib/portage/elog/mod_custom.py
> index 7cfafeccc..aaf1d3b1b 100644
> --- a/lib/portage/elog/mod_custom.py