From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6005C138A1C for ; Sat, 28 Feb 2015 17:34:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5C34E0874; Sat, 28 Feb 2015 17:34:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8A738E0874 for ; Sat, 28 Feb 2015 17:34:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E4D0340A30 for ; Sat, 28 Feb 2015 17:34:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C6F9612BFA for ; Sat, 28 Feb 2015 17:34:01 +0000 (UTC) From: "Pavel Kazakov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pavel Kazakov" Message-ID: <1425144729.1d3a298c9d0d9aaf908542b77a8e6187965b1c78.nullishzero@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: man/ X-VCS-Repository: proj/portage X-VCS-Files: man/emaint.1 X-VCS-Directories: man/ X-VCS-Committer: nullishzero X-VCS-Committer-Name: Pavel Kazakov X-VCS-Revision: 1d3a298c9d0d9aaf908542b77a8e6187965b1c78 X-VCS-Branch: master Date: Sat, 28 Feb 2015 17:34:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5d10846d-ea91-4e13-98f4-563e1b270820 X-Archives-Hash: 8a9777f70875edd6c97e72fa42e2e8aa commit: 1d3a298c9d0d9aaf908542b77a8e6187965b1c78 Author: Pavel Kazakov gentoo org> AuthorDate: Sat Feb 28 17:32:09 2015 +0000 Commit: Pavel Kazakov gentoo org> CommitDate: Sat Feb 28 17:32:09 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1d3a298c main/emaint.1: Add entry about the merges module --- man/emaint.1 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/man/emaint.1 b/man/emaint.1 index 6b8fdf9..c97945f 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 Mike Frysinger Brian Dolbec .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)