* [gentoo-commits] proj/portage:multilib commit in: lib/_emerge/
@ 2020-10-30 10:54 Thomas Sachau
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Sachau @ 2020-10-30 10:54 UTC (permalink / raw
To: gentoo-commits
commit: 06ad89f7678ba2284636a30db1e27f41450ea1e3
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 10:54:01 2020 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 10:54:01 2020 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=06ad89f7
Fix warning
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
lib/_emerge/actions.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py
index 8fb07bbd8..0472cb951 100644
--- a/lib/_emerge/actions.py
+++ b/lib/_emerge/actions.py
@@ -2954,7 +2954,7 @@ def run_action(emerge_config):
apply_priorities(emerge_config.target_config.settings)
if 'force-multilib' in emerge_config.target_config.settings.features:
- if emerge_config.target_config.settings.get("NO_AUTO_FLAG", "") is "":
+ if emerge_config.target_config.settings.get("NO_AUTO_FLAG", "") == "":
writemsg_level(bad("!!! Failed to find vars from extra profile") + "\n",level=logging.ERROR, noiselevel=-1)
writemsg_level(bad("!!! Please make sure that you did follow the instructions and included the extra profile\n"),level=logging.ERROR, noiselevel=-1)
writemsg_level(bad("!!! http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=blob;f=doc/portage-multilib-instructions\n"),level=logging.ERROR, noiselevel=-1)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: lib/_emerge/
@ 2022-03-21 10:41 Thomas Sachau
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Sachau @ 2022-03-21 10:41 UTC (permalink / raw
To: gentoo-commits
commit: 8dd8ef42d00b0bc6b90ab27d114e622c341ab609
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 10:30:17 2022 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:30:17 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=8dd8ef42
Fix intend
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
lib/_emerge/Package.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/_emerge/Package.py b/lib/_emerge/Package.py
index 0ee9bfb8b..9018b1e52 100644
--- a/lib/_emerge/Package.py
+++ b/lib/_emerge/Package.py
@@ -140,12 +140,12 @@ class Package(Task):
implicit_match = db._iuse_implicit_cnstr(self.cpv, self._metadata)
else:
implicit_match = db._repoman_iuse_implicit_cnstr(self.cpv, self._metadata)
- if 'force-multilib' in self.root_config.settings.features:
- iuse = self._metadata["IUSE"]
- for multilib_abis in self.root_config.settings.get("MULTILIB_ABIS", '').split():
- iuse += " multilib_abi_" + multilib_abis
- iuse += " abiwrapper"
- self._metadata["IUSE"] = iuse
+ if 'force-multilib' in self.root_config.settings.features:
+ iuse = self._metadata["IUSE"]
+ for multilib_abis in self.root_config.settings.get("MULTILIB_ABIS", '').split():
+ iuse += " multilib_abi_" + multilib_abis
+ iuse += " abiwrapper"
+ self._metadata["IUSE"] = iuse
usealiases = self.root_config.settings._use_manager.getUseAliases(self)
self.iuse = self._iuse(
self, self._metadata["IUSE"].split(), implicit_match, usealiases, self.eapi
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: lib/_emerge/
@ 2022-03-21 10:42 Thomas Sachau
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Sachau @ 2022-03-21 10:42 UTC (permalink / raw
To: gentoo-commits
commit: 5fede333061375af42be5fae452edeced6258415
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 10:31:54 2022 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:31:54 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=5fede333
Fix intend
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
lib/_emerge/actions.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py
index 35c9e4b7f..ee591d659 100644
--- a/lib/_emerge/actions.py
+++ b/lib/_emerge/actions.py
@@ -3417,13 +3417,13 @@ def run_action(emerge_config):
apply_priorities(emerge_config.target_config.settings)
- if 'force-multilib' in emerge_config.target_config.settings.features:
- if emerge_config.target_config.settings.get("NO_AUTO_FLAG", "") == "":
- writemsg_level(bad("!!! Failed to find vars from extra profile") + "\n",level=logging.ERROR, noiselevel=-1)
- writemsg_level(bad("!!! Please make sure that you did follow the instructions and included the extra profile\n"),level=logging.ERROR, noiselevel=-1)
- writemsg_level(bad("!!! http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=blob;f=doc/portage-multilib-instructions\n"),level=logging.ERROR, noiselevel=-1)
- writemsg_level(bad("!!! has some basic instructions for the setup\n"),level=logging.ERROR, noiselevel=-1)
- return 1
+ if 'force-multilib' in emerge_config.target_config.settings.features:
+ if emerge_config.target_config.settings.get("NO_AUTO_FLAG", "") == "":
+ writemsg_level(bad("!!! Failed to find vars from extra profile") + "\n",level=logging.ERROR, noiselevel=-1)
+ writemsg_level(bad("!!! Please make sure that you did follow the instructions and included the extra profile\n"),level=logging.ERROR, noiselevel=-1)
+ writemsg_level(bad("!!! http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=blob;f=doc/portage-multilib-instructions\n"),level=logging.ERROR, noiselevel=-1)
+ writemsg_level(bad("!!! has some basic instructions for the setup\n"),level=logging.ERROR, noiselevel=-1)
+ return 1
if (
"--autounmask-continue" in emerge_config.opts
and emerge_config.opts.get("--autounmask") == "n"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: lib/_emerge/
@ 2022-03-21 10:42 Thomas Sachau
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Sachau @ 2022-03-21 10:42 UTC (permalink / raw
To: gentoo-commits
commit: daf2bd81b4046d42990b29a0ab716295cbd048cc
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 10:33:03 2022 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:33:03 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=daf2bd81
Fix intend
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
lib/_emerge/EbuildExecuter.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/_emerge/EbuildExecuter.py b/lib/_emerge/EbuildExecuter.py
index 5a528f432..9f37528ed 100644
--- a/lib/_emerge/EbuildExecuter.py
+++ b/lib/_emerge/EbuildExecuter.py
@@ -94,7 +94,7 @@ class EbuildExecuter(CompositeTask):
)
)
- if 'force-multilib' in self.settings.features:
- self._start_task(ebuild_phases, self._install_exit)
- else:
- self._start_task(ebuild_phases, self._default_final_exit)
+ if 'force-multilib' in self.settings.features:
+ self._start_task(ebuild_phases, self._install_exit)
+ else:
+ self._start_task(ebuild_phases, self._default_final_exit)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: lib/_emerge/
@ 2022-03-21 10:58 Thomas Sachau
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Sachau @ 2022-03-21 10:58 UTC (permalink / raw
To: gentoo-commits
commit: be981440fe0f5064800b92a1d2effa4094b976a2
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 10:56:13 2022 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:56:13 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=be981440
Fix intend
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
lib/_emerge/Package.py | 53 +++++++++++++++++++++++++-------------------------
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/lib/_emerge/Package.py b/lib/_emerge/Package.py
index 9018b1e52..171ed3e6f 100644
--- a/lib/_emerge/Package.py
+++ b/lib/_emerge/Package.py
@@ -365,32 +365,33 @@ class Package(Task):
)
self._metadata_exception(k, e)
- 'force-multilib' in self.root_config.settings.features:
- mysettings = self.root_config.settings
- no_auto_flag = frozenset(mysettings.get("NO_AUTO_FLAG", "").split())
- for i, x in enumerate(validated_atoms):
- if not isinstance(x, Atom):
- continue
- if x.cp in no_auto_flag:
- continue
- multilib_flags = []
- for multilib_abis in mysettings.get("MULTILIB_ABIS", '').split():
- multilib_flag = 'multilib_abi_' + multilib_abis
- if x.unevaluated_atom.use is None or \
- x.unevaluated_atom.use.conditional is None or \
- multilib_flag not in x.unevaluated_atom.use.conditional.enabled:
- multilib_flags.append(multilib_flag + '?')
- if multilib_flags:
- if x.unevaluated_atom.use is None:
- use_tokens = []
- else:
- use_tokens = list(x.unevaluated_atom.use.tokens)
- use_tokens.extend(multilib_flags)
- validated_atoms[i] = Atom(
- x.unevaluated_atom.without_use + \
- "[%s]" % (",".join(use_tokens)))
-
-self._validated_atoms = tuple(
+ if self.root_config.settings.local_config and \
+ 'force-multilib' in self.root_config.settings.features:
+ mysettings = self.root_config.settings
+ no_auto_flag = frozenset(mysettings.get("NO_AUTO_FLAG", "").split())
+ for i, x in enumerate(validated_atoms):
+ if not isinstance(x, Atom):
+ continue
+ if x.cp in no_auto_flag:
+ continue
+ multilib_flags = []
+ for multilib_abis in mysettings.get("MULTILIB_ABIS", '').split():
+ multilib_flag = 'multilib_abi_' + multilib_abis
+ if x.unevaluated_atom.use is None or \
+ x.unevaluated_atom.use.conditional is None or \
+ multilib_flag not in x.unevaluated_atom.use.conditional.enabled:
+ multilib_flags.append(multilib_flag + '?')
+ if multilib_flags:
+ if x.unevaluated_atom.use is None:
+ use_tokens = []
+ else:
+ use_tokens = list(x.unevaluated_atom.use.tokens)
+ use_tokens.extend(multilib_flags)
+ validated_atoms[i] = Atom(
+ x.unevaluated_atom.without_use + \
+ "[%s]" % (",".join(use_tokens)))
+
+ self._validated_atoms = tuple(
set(atom for atom in validated_atoms if isinstance(atom, Atom))
)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: lib/_emerge/
@ 2022-03-21 11:15 Thomas Sachau
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Sachau @ 2022-03-21 11:15 UTC (permalink / raw
To: gentoo-commits
commit: ce24ddf9e0a9ba9e86f9ccf38004559c6367d756
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 11:15:06 2022 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 11:15:06 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ce24ddf9
Re-add _install_exit target
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
lib/_emerge/EbuildExecuter.py | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/lib/_emerge/EbuildExecuter.py b/lib/_emerge/EbuildExecuter.py
index 9f37528ed..7cb90fad7 100644
--- a/lib/_emerge/EbuildExecuter.py
+++ b/lib/_emerge/EbuildExecuter.py
@@ -98,3 +98,30 @@ class EbuildExecuter(CompositeTask):
self._start_task(ebuild_phases, self._install_exit)
else:
self._start_task(ebuild_phases, self._default_final_exit)
+
+
+ def _install_exit(self, install_phase):
+
+ if self._default_exit(install_phase) != os.EX_OK:
+ self.wait()
+ return
+ if not os.path.exists(self.settings["D"]):
+ pkg = self.pkg
+ scheduler = self.scheduler
+ settings = self.settings
+ cleanup = 1
+
+ # This initializes PORTAGE_LOG_FILE.
+ portage.prepare_build_dirs(pkg.root, settings, cleanup)
+
+ setup_phase = EbuildPhase(background=self.background,
+ phase="setup", scheduler=scheduler,
+ settings=settings)
+
+ setup_phase.addExitListener(self._setup_exit)
+ self._current_task = setup_phase
+ self.scheduler.scheduleSetup(setup_phase)
+ else:
+ self.returncode = os.EX_OK
+ self.wait()
+ return
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-03-21 11:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-30 10:54 [gentoo-commits] proj/portage:multilib commit in: lib/_emerge/ Thomas Sachau
-- strict thread matches above, loose matches on Subject: below --
2022-03-21 10:41 Thomas Sachau
2022-03-21 10:42 Thomas Sachau
2022-03-21 10:42 Thomas Sachau
2022-03-21 10:58 Thomas Sachau
2022-03-21 11:15 Thomas Sachau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox