aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Kazakov <nullishzero@gentoo.org>2015-02-28 09:32:09 -0800
committerPavel Kazakov <nullishzero@gentoo.org>2015-02-28 09:32:09 -0800
commit1d3a298c9d0d9aaf908542b77a8e6187965b1c78 (patch)
tree9f78b548bc8ebb89212eba5e86f956e47300269d
parentDo not interrupt on SIGCONT (diff)
downloadportage-1d3a298c9d0d9aaf908542b77a8e6187965b1c78.tar.gz
portage-1d3a298c9d0d9aaf908542b77a8e6187965b1c78.tar.bz2
portage-1d3a298c9d0d9aaf908542b77a8e6187965b1c78.zip
main/emaint.1: Add entry about the merges module
-rw-r--r--man/emaint.110
1 files changed, 9 insertions, 1 deletions
diff --git a/man/emaint.1 b/man/emaint.1
index 6b8fdf90b..c97945fba 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -5,7 +5,7 @@ emaint \- performs package managment related system health checks and maintenanc
.BR emaint
[\fIoptions\fR]
[\fBall\fR | \fBbinhost\fR | \fBcleanresume\fR | \
-\fBmovebin\fR | \fBmoveinst\fR | \fBworld\fR]
+\fBmerges\fR | \fBmovebin\fR | \fBmoveinst\fR | \fBworld\fR]
.SH DESCRIPTION
The emaint program provides a command line interface to package
management health checks and maintenance.
@@ -31,6 +31,9 @@ Clean out old logs from the \fBPORT_LOGDIR\fR using the command
See the \fBmake.conf\fR(5) man page for additional information as well as
enabling the \fB'clean-logs'\fR feature in emerge to do this automatically.
.TP
+.BR merges
+Scan for failed package merges and attempt to fix those failed packages.
+.TP
.BR movebin
Perform package move updates for binary packages located in \fBPKGDIR\fR.
.TP
@@ -82,6 +85,7 @@ than rsync.
Please report bugs via http://bugs.gentoo.org/
.SH AUTHORS
.nf
+Pavel Kazakov <nullishzero@gentoo.org>
Mike Frysinger <vapier@gentoo.org>
Brian Dolbec <dolsen@gentoo.org>
.fi
@@ -92,6 +96,10 @@ Contains a list of all user\-specified packages.
.TP
.B /var/lib/portage/config
Contains the paths and md5sums of all the config files being tracked.
+.TP
+.B /var/lib/portage/failed-merges
+Contains the packages and timestamps of any failed merges being cleaned from
+the system, and to be re-emerged.
.SH "SEE ALSO"
.BR emerge (1),
.BR portage (5)