[gentoo-commits] proj/portage:master commit in: lib/_emerge/, lib/_emerge/resolver/
commit: 0b21a5a392bd84c07b94373991f59108fbe98516
Author: Oskari Pirhonen gmail com>
AuthorDate: Wed Mar 22 01:56:23 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 30 23:30:07 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0b21a5a3
Convert %-formats to fstrings
Files under lib/_emerge
Signed-off-by: Oskari Pirhonen gmail.com>
Closes: https://github.com/gentoo/portage/pull/1013
Signed-off-by: Sam James gentoo.org>
lib/_emerge/AbstractEbuildProcess.py | 64 -
lib/_emerge/AsynchronousLock.py| 5 +-
lib/_emerge/BinpkgEnvExtractor.py | 5 +-
lib/_emerge/BinpkgExtractorAsync.py| 60 -
lib/_emerge/BinpkgFetcher.py | 3 +-
lib/_emerge/BinpkgVerifier.py | 17 +--
lib/_emerge/EbuildMerge.py | 8 +-
lib/_emerge/JobStatusDisplay.py| 8 +-
lib/_emerge/MergeListItem.py | 4 +-
lib/_emerge/Package.py | 8 +-
lib/_emerge/Scheduler.py | 6 +-
lib/_emerge/SpawnProcess.py| 11 +-
lib/_emerge/SubProcess.py | 2 +-
lib/_emerge/Task.py| 5 +-
lib/_emerge/UserQuery.py | 5 +-
lib/_emerge/actions.py | 128 --
lib/_emerge/chk_updated_cfg_files.py | 6 +-
lib/_emerge/countdown.py | 6 +-
lib/_emerge/depgraph.py| 236 -
lib/_emerge/resolver/output.py | 3 +-
lib/_emerge/resolver/output_helpers.py | 10 +-
lib/_emerge/resolver/slot_collision.py | 65 +++--
lib/_emerge/search.py | 3 +-
lib/_emerge/unmerge.py | 28 ++--
24 files changed, 271 insertions(+), 425 deletions(-)
diff --git a/lib/_emerge/AbstractEbuildProcess.py
b/lib/_emerge/AbstractEbuildProcess.py
index fe2ef426a..be257a620 100644
--- a/lib/_emerge/AbstractEbuildProcess.py
+++ b/lib/_emerge/AbstractEbuildProcess.py
@@ -13,7 +13,6 @@ from _emerge.EbuildBuildDir import EbuildBuildDir
from _emerge.EbuildIpcDaemon import EbuildIpcDaemon
import portage
from portage.elog import messages as elog_messages
-from portage.localization import _
from portage.package.ebuild._ipc.ExitCommand import ExitCommand
from portage.package.ebuild._ipc.QueryCommand import QueryCommand
from portage import os
@@ -72,10 +71,10 @@ class AbstractEbuildProcess(SpawnProcess):
# die_hooks for some reason, and PORTAGE_BUILDDIR
# doesn't exist yet.
if need_builddir and not
os.path.isdir(self.settings["PORTAGE_BUILDDIR"]):
-msg = _(
-"The ebuild phase '%s' has been aborted "
-"since PORTAGE_BUILDDIR does not exist: '%s'"
-) % (self.phase, self.settings["PORTAGE_BUILDDIR"])
+msg = (
+f"The ebuild phase '{self.phase}' has been aborted since "
+f"PORTAGE_BUILDDIR does not exist:
'{self.settings['PORTAGE_BUILDDIR']}'"
+)
self._eerror(textwrap.wrap(msg, 72))
self.returncode = 1
self._async_wait()
@@ -326,11 +325,10 @@ class AbstractEbuildProcess(SpawnProcess):
def _orphan_process_warn(self):
phase = self.phase
-msg = _(
-"The ebuild phase '%s' with pid %s appears "
-"to have left an orphan process running in the "
-"background."
-) % (phase, self.pid)
+msg = (
+f"The ebuild phase '{phase}' with pid {self.pid} appears "
+"to have left an orphan process running in the background."
+)
self._eerror(textwrap.wrap(msg, 72))
@@ -346,38 +344,32 @@ class AbstractEbuildProcess(SpawnProcess):
) or os.isatty(slave_fd)
def _killed_by_signal(self, signum):
-msg = _("The ebuild phase '%s' has been " "killed by signal %s.") % (
-self.phase,
-signum,
-)
+msg = f"The ebuild phase '{self.phase}' has been killed by signal
{signum}."
self._eerror(textwrap.wrap(msg, 72))
def _unexpected_exit(self):
phase = self.phase
msg = (
-_(
-"The ebuild phase '%s' has exited "
-"unexpectedly. This type of behavior "
-"is known to be triggered "
-"by things such as failed variable "
-"assignments (bug #190128) or bad substitution "
-"errors (bug #200313). Normally, before exiting, bash should "
-"have displayed an error message above. If bash did not "
-"produce an error message above, it's possible "
-"that the ebuild has called `exit` when it "
-"should have called `die` instead. This behavior may also "
-"be triggered by a corrupt bash binary or a hardware "
-"problem such as memory or cpu malfunction. If the problem is
not "
-
[gentoo-commits] proj/portage:master commit in: lib/_emerge/, lib/_emerge/resolver/, lib/portage/proxy/, lib/portage/, ...
commit: 02ff5655a391b4b045a6edc7971233b3bba127ff Author: Michał Górny gentoo org> AuthorDate: Thu Jul 16 18:05:56 2020 + Commit: Michał Górny gentoo org> CommitDate: Thu Jul 16 18:05:56 2020 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=02ff5655 Update copyright headers after previous change Signed-off-by: Michał Górny gentoo.org> lib/_emerge/DependencyArg.py | 2 +- lib/_emerge/PackageVirtualDbapi.py | 2 +- lib/_emerge/TaskSequence.py| 2 +- lib/_emerge/UseFlagDisplay.py | 2 +- lib/_emerge/UserQuery.py | 2 +- lib/_emerge/resolver/DbapiProvidesIndex.py | 2 +- lib/portage/_emirrordist/Config.py | 2 +- lib/portage/output.py | 2 +- lib/portage/proxy/objectproxy.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/_emerge/DependencyArg.py b/lib/_emerge/DependencyArg.py index a997f0f90..2d24359f2 100644 --- a/lib/_emerge/DependencyArg.py +++ b/lib/_emerge/DependencyArg.py @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import sys diff --git a/lib/_emerge/PackageVirtualDbapi.py b/lib/_emerge/PackageVirtualDbapi.py index 957eab594..a0905cce8 100644 --- a/lib/_emerge/PackageVirtualDbapi.py +++ b/lib/_emerge/PackageVirtualDbapi.py @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import sys diff --git a/lib/_emerge/TaskSequence.py b/lib/_emerge/TaskSequence.py index 2fd349810..d6816719f 100644 --- a/lib/_emerge/TaskSequence.py +++ b/lib/_emerge/TaskSequence.py @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import sys diff --git a/lib/_emerge/UseFlagDisplay.py b/lib/_emerge/UseFlagDisplay.py index 6f6e27fb8..275397fea 100644 --- a/lib/_emerge/UseFlagDisplay.py +++ b/lib/_emerge/UseFlagDisplay.py @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import collections diff --git a/lib/_emerge/UserQuery.py b/lib/_emerge/UserQuery.py index a9b3a4865..96cac4649 100644 --- a/lib/_emerge/UserQuery.py +++ b/lib/_emerge/UserQuery.py @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --git a/lib/_emerge/resolver/DbapiProvidesIndex.py b/lib/_emerge/resolver/DbapiProvidesIndex.py index 9d122a7e5..140c8256b 100644 --- a/lib/_emerge/resolver/DbapiProvidesIndex.py +++ b/lib/_emerge/resolver/DbapiProvidesIndex.py @@ -1,4 +1,4 @@ -# Copyright 2015 Gentoo Foundation +# Copyright 2015-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import bisect diff --git a/lib/portage/_emirrordist/Config.py b/lib/portage/_emirrordist/Config.py index d5dea7ab4..736ce655e 100644 --- a/lib/portage/_emirrordist/Config.py +++ b/lib/portage/_emirrordist/Config.py @@ -1,4 +1,4 @@ -# Copyright 2013-2019 Gentoo Authors +# Copyright 2013-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import copy diff --git a/lib/portage/output.py b/lib/portage/output.py index 8bfcd91c2..26880adca 100644 --- a/lib/portage/output.py +++ b/lib/portage/output.py @@ -1,4 +1,4 @@ -# Copyright 1998-2015 Gentoo Foundation +# Copyright 1998-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 from __future__ import division diff --git a/lib/portage/proxy/objectproxy.py b/lib/portage/proxy/objectproxy.py index e3bf4f75a..a1f1b6ed6 100644 --- a/lib/portage/proxy/objectproxy.py +++ b/lib/portage/proxy/objectproxy.py @@ -1,4 +1,4 @@ -# Copyright 2008-2012 Gentoo Foundation +# Copyright 2008-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import sys
[gentoo-commits] proj/portage:master commit in: lib/_emerge/, lib/_emerge/resolver/
commit: 463b2d36f3d95760e48543f1f30410aa76267538
Author: Zac Medico gentoo org>
AuthorDate: Sun Dec 15 05:30:13 2019 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Dec 15 06:27:26 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=463b2d36
emerge: Show package USE in conflict messages
Bug: https://bugs.gentoo.org/310009
Signed-off-by: Zac Medico gentoo.org>
lib/_emerge/depgraph.py| 26 +-
lib/_emerge/resolver/slot_collision.py | 17 +
2 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index 02e0e075d..1a5448c8f 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -1285,7 +1285,10 @@ class depgraph(object):
msg.append("\n\n")
msg.append(indent)
- msg.append(str(pkg))
+ msg.append("%s %s" % (pkg,
+ pkg_use_display(pkg,
+ self._frozen_config.myopts,
+
modified_use=self._pkg_use_enabled(pkg
msg.append(" conflicts with\n")
for parent, atom in parent_atoms:
@@ -1302,8 +1305,15 @@ class depgraph(object):
atom, marker = format_unmatched_atom(
pkg, atom,
self._pkg_use_enabled)
+ if isinstance(parent, Package):
+ use_display =
pkg_use_display(parent,
+
self._frozen_config.myopts,
+
modified_use=self._pkg_use_enabled(parent))
+ else:
+ use_display = ""
+
msg.append(2*indent)
- msg.append("%s required by %s\n" %
(atom, parent))
+ msg.append("%s required by %s %s\n" %
(atom, parent, use_display))
msg.append(2*indent)
msg.append(marker)
msg.append("\n")
@@ -8472,14 +8482,20 @@ class depgraph(object):
else:
# Display the specific atom
from SetArg or
# Package types.
+ if isinstance(parent, Package):
+ use_display =
pkg_use_display(parent,
+
self._frozen_config.myopts,
+
modified_use=self._pkg_use_enabled(parent))
+ else:
+ use_display = ""
if atom.package and atom !=
atom.unevaluated_atom:
# Show the unevaluated
atom, since it can reveal
# issues with
conditional use-flags missing
# from IUSE.
- msg.append("%s (%s)
required by %s" %
-
(atom.unevaluated_atom, atom, parent))
+ msg.append("%s (%s)
required by %s %s" %
+
(atom.unevaluated_atom, atom, parent, use_display))
else:
- msg.append("%s required
by %s" % (atom, parent))
+ msg.append("%s required
by %s %s" % (atom, parent, use_display))
msg.append("\n")
msg.append("\n")
diff --git a/lib/_emerge/resolver/slot_collision.py
b/lib/_emerge/resolver/slot_collision.py
index f676b38c8..682a3a0a5 100644
--- a/lib/_emerge/resolver/slot_collision.py
+++ b/lib/_emerge/resolver/slot_collision.py
@@ -9,6 +9,7 @@ from portage import _encodings, _unicode_encode
from _emerge.AtomArg import AtomArg
from _emerge.Package import Package
from _emerge.PackageArg import PackageArg
+from _emerge.UseFlagDisplay import pkg_use_display
from portage.dep import check_required_use
from portage.output import colorize
from portage._sets.base import InternalPackageSet
@@ -260,7 +261,9 @@ class slot_conflict_handler(object):
