diff options
author | Sebastian Luther <SebastianLuther@gmx.de> | 2011-09-18 22:00:57 +0200 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-09-18 13:15:25 -0700 |
commit | 424f8f8d6587f015e074e3e915746929a990a52f (patch) | |
tree | e34a52e1b835dc15c55357d1edd4bcbe6e74edde | |
parent | 57cc4e3e8991e7c4394d1dff7698aa62ed2a286b (diff) | |
download | portage-424f8f8d6587f015e074e3e915746929a990a52f.tar.gz portage-424f8f8d6587f015e074e3e915746929a990a52f.tar.bz2 portage-424f8f8d6587f015e074e3e915746929a990a52f.zip |
autounmask: Document where changes are writen
-rw-r--r-- | man/emerge.1 | 4 | ||||
-rw-r--r-- | pym/_emerge/help.py | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index f7ad3ed5a..aa85a7bf2 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -307,6 +307,10 @@ disable this option by default in \fBmake.conf\fR(5). .BR "\-\-autounmask\-write [ y | n ]" If \-\-autounmask is enabled, changes are written 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. .TP .BR \-\-backtrack=COUNT Specifies an integer number of times to backtrack if diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index 57b376d55..1e62ccf1d 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -326,7 +326,11 @@ def help(myopts, havecolor=1): print(" " + green("--autounmask-write") + " [ %s | %s ]" % \ (turquoise("y"), turquoise("n"))) desc = "If --autounmask is enabled, changes are written " + \ - "to config files, respecting CONFIG_PROTECT and --ask." + "to config files, respecting CONFIG_PROTECT and --ask. " + \ + "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." for line in wrap(desc, desc_width): print(desc_indent + line) print() |