diff options
author | Fabian Groffen <grobian@gentoo.org> | 2014-09-28 19:52:16 +0200 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2014-09-28 19:52:16 +0200 |
commit | 990c5f4896b309fdcaf1dbbb5779177ecfcf6e74 (patch) | |
tree | f54ebb8d5bcbfea1986b9c73eee0ec3c5b390577 /man | |
parent | install_qa_check_macho: introduce QA_IGNORE_INSTALL_NAME_FILES (diff) | |
parent | Use a single grep call for gcc warning checks (diff) | |
download | portage-990c5f4896b309fdcaf1dbbb5779177ecfcf6e74.tar.gz portage-990c5f4896b309fdcaf1dbbb5779177ecfcf6e74.tar.bz2 portage-990c5f4896b309fdcaf1dbbb5779177ecfcf6e74.zip |
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
Conflicts:
bin/ebuild-helpers/emake
bin/misc-functions.sh
bin/portageq
doc/Makefile
pym/_emerge/EbuildBuild.py
pym/portage/const.py
pym/portage/dbapi/vartree.py
pym/portage/package/ebuild/doebuild.py
Diffstat (limited to 'man')
-rw-r--r-- | man/emerge.1 | 19 | ||||
-rw-r--r-- | man/repoman.1 | 4 |
2 files changed, 21 insertions, 2 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index f887bf723..169d34c9b 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -1,4 +1,4 @@ -.TH "EMERGE" "1" "Mar 2014" "Portage VERSION" "Portage" +.TH "EMERGE" "1" "Sep 2014" "Portage VERSION" "Portage" .SH "NAME" emerge \- Command\-line interface to the Portage system .SH "SYNOPSIS" @@ -297,6 +297,20 @@ re\-distributable. With default configuration, this would result in an effective \fBACCEPT_RESTRICT\fR value of "* -bindist". .TP +.BR "\-\-alert [ y | n ] (\-A short option)" +Add a terminal bell character ('\\a') to all interactive prompts. This +is especially useful if dependency resolution is taking a long time, and +you want emerge to alert you when it is finished. If you use +\fBemerge -auAD world\fR, emerge will courteously point out when it has +finished calculating the graph. + +\fB--alert\fR may be 'y' or 'n'. 'true' and 'false' mean the same thing. +Using \fB--alert\fR without an option is the same as using it with 'y'. +Try it with 'emerge -aA portage'. + +If your terminal emulator is set up to make '\\a' into a window manager +urgency hint, move your cursor to a different window to get the effect. +.TP .BR "\-\-alphabetical " When displaying USE and other flag output, combines the enabled and disabled lists into one list and sorts the whole list alphabetically. @@ -353,7 +367,8 @@ to config files, respecting \fBCONFIG_PROTECT\fR and \fB\-\-ask\fR. If the corresponding package.* is a file, the changes are appended to it, if it is a directory, changes are written to the lexicographically last file. This way it is always ensured that the new changes take -precedence over existing changes. +precedence over existing changes. This option is automatically enabled with +\-\-ask. .TP .BR \-\-backtrack=COUNT Specifies an integer number of times to backtrack if diff --git a/man/repoman.1 b/man/repoman.1 index a78f94e90..c57676870 100644 --- a/man/repoman.1 +++ b/man/repoman.1 @@ -12,6 +12,10 @@ checks the quality of ebuild repositories. Note: \fBrepoman commit\fR only works \fIinside local\fR cvs, git, or subversion repositories. + +Note: Messages pertaining to specific lines may be inaccurate in the +prescence of continuation lines from use of the \fI\\\fR character in +BASH. .SH OPTIONS .TP \fB-a\fR, \fB--ask\fR |