diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-28 09:34:07 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-28 09:34:07 +0000 |
| commit | bd387b48cdedf0660012d64b6ce7dd5b8b99860d (patch) | |
| tree | 3da84160af23fe1a6fca25634ca83d497e304772 | |
| parent | ca170944d588d6c752267155901fa6f5c0800db8 (diff) | |
| download | portage-bd387b48cdedf0660012d64b6ce7dd5b8b99860d.tar.gz portage-bd387b48cdedf0660012d64b6ce7dd5b8b99860d.tar.bz2 portage-bd387b48cdedf0660012d64b6ce7dd5b8b99860d.zip | |
For bug #144333, document the new --reinstall=changed-use option. (trunk r7081)
svn path=/main/branches/2.1.2/; revision=7082
| -rw-r--r-- | man/emerge.1 | 6 | ||||
| -rw-r--r-- | pym/emergehelp.py | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index 1a4aea020..dd3cda1ae 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -355,6 +355,12 @@ the printout: Results may vary, but the general outcome is a reduced or condensed output from portage's displays. .TP +.BR "\-\-reinstall changed\-use" +Tells emerge to include installed packages where USE flags have +changed since installation. Unlike \fB\-\-newuse\fR, this option does +not trigger reinstallation when flags that the user has not +enabled are added or removed. +.TP .BR "\-\-skipfirst" This option is only valid when used with \fB\-\-resume\fR. It removes the first package in the resume list so that a merge may continue in the presence diff --git a/pym/emergehelp.py b/pym/emergehelp.py index 69c8453e9..fa7bf32ce 100644 --- a/pym/emergehelp.py +++ b/pym/emergehelp.py @@ -16,7 +16,7 @@ def shorthelp(): print " "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("world")+" | "+green("config")+" | "+green("--sync")+" ] " print bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhikKlnNoOpqPsStuvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]" print " [ " + green("--color")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ] [ "+green("--columns")+" ]" - print " ["+green("--nospinner")+"]" + print " [ "+green("--reinstall ")+turquoise("changed-use")+" ] ["+green("--nospinner")+"]" print " [ "+green("--deep")+" ] [" + green("--with-bdeps")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ]" print bold("Actions:")+" [ "+green("--clean")+" | "+green("--depclean")+" | "+green("--prune")+" | "+green("--regen")+" | "+green("--search")+" | "+green("--unmerge")+" ]" @@ -293,6 +293,12 @@ def help(myaction,myopts,havecolor=1): print " Effects vary, but the general outcome is a reduced or condensed" print " output from portage's displays." print + print " "+green("--reinstall ") + turquoise("changed-use") + print " Tells emerge to include installed packages where USE flags have" + print " changed since installation. Unlike --newuse, this option does" + print " not trigger reinstallation when flags that the user has not" + print " enabled are added or removed." + print print " "+green("--skipfirst") print " This option is only valid in a resume situation. It removes the" print " first package in the resume list so that a merge may continue in" |