diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-05-07 23:23:40 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-05-07 23:23:40 -0700 |
| commit | bc18e1e7c3af475412e997489058c58942ebfdcb (patch) | |
| tree | 807396453e764cfb42796aeef0b11c8d4dbb17a3 /man | |
| parent | d448e1f1844fe1fe8b865f8f9080206b84c6f4e3 (diff) | |
| download | portage-bc18e1e7c3af475412e997489058c58942ebfdcb.tar.gz portage-bc18e1e7c3af475412e997489058c58942ebfdcb.tar.bz2 portage-bc18e1e7c3af475412e997489058c58942ebfdcb.zip | |
COLLISION_IGNORE: support fnmatch patterns
This allows it to be combined with the COLLISION_IGNORE_UNOWNED
variable from commit 33545ea18e8816addb3c54bb26a0cc788b8512e6, so only
one variable is needed.
Diffstat (limited to 'man')
| -rw-r--r-- | man/make.conf.5 | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/man/make.conf.5 b/man/make.conf.5 index 7b1d4c046..39c3f8e48 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -128,18 +128,13 @@ Determines how long the countdown delay will be after running .br Defaults to 5 seconds. .TP -\fBCOLLISION_IGNORE\fR = \fI[space delimited list of files and/or directories]\fR +\fBCOLLISION_IGNORE\fR = \fI[space delimited list of shell patterns]\fR This variable allows the user to disable \fIcollision\-protect\fR and -\fIprotect\-owned\fR for specific files and/or directories. +\fIprotect\-owned\fR for specific shell patterns. For backward +compatibility, directories that are listed without a shell pattern will +automatically have /* appended to them. .br -Defaults to /lib/modules. -.TP -\fBCOLLISION_IGNORE_UNOWNED\fR = \fI[space delimited list of shell patterns]\fR -This variable allows the user to disable \fIcollision\-protect\fR and -\fIprotect\-owned\fR for specific shell patterns for files that are -not owned by any packages. -.br -Defaults to *.pyc and *.pyo patterns. +Defaults to "/lib/modules/* *.py[co]". .TP \fBCONFIG_PROTECT\fR = \fI[space delimited list of files and/or directories]\fR All files and/or directories that are defined here will have "config file protection" |