diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2024-01-15 15:10:03 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2024-01-16 08:01:53 -0800 |
| commit | a5078e5774932103d4ad367de4c6bf130a6da34f (patch) | |
| tree | 4b8a5578fbe44de5fd27321db80d6cac20749cb5 /man | |
| parent | bintree: add missing newlines to signed binpkg update notice (diff) | |
| download | portage-a5078e5774932103d4ad367de4c6bf130a6da34f.tar.gz portage-a5078e5774932103d4ad367de4c6bf130a6da34f.tar.bz2 portage-a5078e5774932103d4ad367de4c6bf130a6da34f.zip | |
emerge: backtrack consistently regardless of --fetchonly
Make the _accept_blocker_conflicts method always return
True when backtracking is enabled, so that backtracking
results will be identical regardless of options that
_accept_blocker_conflicts treats specially. This way,
conflicts will only be accepted when backtracking is
disabled or all backtracking tries have been exhausted.
Make --nodeps imply --backtrack=0, since backtracking
is only useful with dependencies.
Make _eliminate_rebuilds return early if there are
slot conflicts, since the merge list is invalid anyway,
and its possible that state inconsistencies could
trigger unexpected exceptions as in bug 922038. Make
the KeyError from bug 922038 a warning, and include
relevant information to help trace the inconsistency
back to the _eliminate_rebuilds method or some other
source like _solve_non_slot_operator_slot_conflicts.
Bug: https://bugs.gentoo.org/161422
Bug: https://bugs.gentoo.org/607252
Bug: https://bugs.gentoo.org/675748
Bug: https://bugs.gentoo.org/922038
Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'man')
| -rw-r--r-- | man/emerge.1 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index e18bc9e25..43dc3f26b 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -1,4 +1,4 @@ -.TH "EMERGE" "1" "Mar 2023" "Portage @VERSION@" "Portage" +.TH "EMERGE" "1" "Jan 2024" "Portage @VERSION@" "Portage" .SH "NAME" emerge \- Command\-line interface to the Portage system .SH "SYNOPSIS" @@ -747,7 +747,8 @@ file to always be merged. .TP .BR \-\-nodeps ", " \-O Merges specified packages without merging any dependencies. Note that -the build may fail if the dependencies aren't satisfied. +the build may fail if the dependencies aren't satisfied. This option +implies \fB--backtrack=0\fR. .TP .BR \-\-noreplace ", " \-n Skips the packages specified on the command\-line that have already |