From b4dc76637c89a8382654efb64835e9930da6d67d Mon Sep 17 00:00:00 2001 From: Jason Stubbs Date: Sun, 13 Nov 2005 00:27:44 +0000 Subject: Recreated 2.0.53 branch and added documentation for `emerge --config` and a description to `emaint --help` svn path=/main/branches/2.0.53/; revision=2300 --- bin/emaint | 7 +++++++ man/emerge.1 | 54 ++++++++++++++++++++++++++---------------------------- pym/emergehelp.py | 5 +++++ 3 files changed, 38 insertions(+), 28 deletions(-) diff --git a/bin/emaint b/bin/emaint index 7f991d9b..b5508652 100755 --- a/bin/emaint +++ b/bin/emaint @@ -66,6 +66,12 @@ def exclusive(option, unused1, unused2, unused3, var=None): usage = "usage: emaint [options] " + " | ".join(module_names) + +usage+= "\n\nCurrently emaint can only check and fix problems with one's world\n" +usage+= "file. Future versions will integrate other portage check-and-fix\n" +usage+= "tools and provide a single interface to system health checks." + + parser = OptionParser(usage=usage) parser.add_option("-c", "--check", help="check for problems", action="callback", callback=exclusive, callback_kwargs={"var":"action"}) @@ -109,3 +115,4 @@ for task in tasks: print "\n".join(result) print "\n" +print "Finished" diff --git a/man/emerge.1 b/man/emerge.1 index ada61a98..3623e1c1 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -157,6 +157,11 @@ all matching packages. This does no checking of dependencies, so it may remove packages necessary for the proper operation of your system. Its arguments can be \fIebuilds\fR, \fIclasses\fR, or \fIdependencies\fR \-\- see \fB\-\-clean\fR above for examples. +.TP +.BR "\-\-config " +Run package specific actions needed to be executed after the +emerge process has completed. This usually entails configuration +file setup or other similar setups that the user may wish to run. .SH "OPTIONS" .TP .BR "\-\-ask " (\fB\-a\fR) @@ -486,17 +491,16 @@ Please report any bugs you encounter through our website: .LP Please include the output of \fBemerge \-\-info\fR when you submit your bug report. -.SH "SEE ALSO" -.BR "emerge \-\-help", -.BR ebuild (1), -.BR ebuild (5), -.BR make.conf (5), -.BR portage (5) -.LP -A number of helper applications reside in \fI/usr/lib/portage/bin\fR. -.LP -The \fBapp\-portage/gentoolkit\fR package contains useful scripts such as -\fBequery\fR (a package query tool). +.SH "AUTHORS" +.nf +Daniel Robbins +Geert Bevin +Achim Gottinger +Nicholas Jones +Phil Bordelon +Mike Frysinger +Marius Mauch +.fi .SH "FILES" .TP \fB/var/lib/portage/world\fR @@ -536,20 +540,14 @@ and \fBworld\fR classes consult this file. \fBDo not edit this file\fR. \fB/etc/make.globals\fR Contains the default variables for the build process. \fBDo not edit this file\fR. -.SH "AUTHORS" -Daniel Robbins -.br -Geert Bevin -.br -Achim Gottinger -.br -Nicholas Jones -.br -Phil Bordelon -.br -Mike Frysinger -.br -Marius Mauch -.br -.SH "CVS HEADER" -$Id: /var/cvsroot/gentoo-src/portage/man/emerge.1,v 1.70.2.15 2005/08/20 03:56:50 vapier Exp $ +.SH "SEE ALSO" +.BR "emerge \-\-help", +.BR ebuild (1), +.BR ebuild (5), +.BR make.conf (5), +.BR portage (5) +.LP +A number of helper applications reside in \fI/usr/lib/portage/bin\fR. +.LP +The \fBapp\-portage/gentoolkit\fR package contains useful scripts such as +\fBequery\fR (a package query tool). diff --git a/pym/emergehelp.py b/pym/emergehelp.py index ed88eac0..19b30a6c 100644 --- a/pym/emergehelp.py +++ b/pym/emergehelp.py @@ -113,6 +113,11 @@ def help(myaction,myopts,havecolor=1): print " your system. Specify arguments using the dependency specification" print " format described in the "+bold("--clean")+" action above." print + print " "+green("--config") + print " Run package specific actions needed to be executed after the" + print " emerge process has completed. This usually entails configuration" + print " file setup or other similar setups that the user may wish to run." + print print turquoise("Options:") print " "+green("--ask")+" ("+green("-a")+" short option)" print " before performing the merge, display what ebuilds and tbz2s will" -- cgit v1.2.3