From: Sebastian Luther <SebastianLuther@gmx.de>
Date: Sun, 18 Sep 2011 20:00:57 +0000 (+0200)
Subject: autounmask: Document where changes are writen
X-Git-Tag: v2.2.0_alpha59~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=424f8f8d6587f015e074e3e915746929a990a52f;p=portage.git

autounmask: Document where changes are writen
---

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()