commit: f1f9062578936d68040490a8122ccf84c087030a
Author: Michael Everitt <gentoo <AT> veremit <DOT> xyz>
AuthorDate: Sun Sep 6 00:05:59 2020 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 23:40:32 2020 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f1f90625
man/{portage,make.conf}.5: Files in subdirs are parsed in lexical order
Most files in packages.*, make.conf/*, *.postsync.d/* are parsed not just in
ascending alphabetical order, but actually in lexographical (lexical) order,
which means alpha-numerically + symbols.
Closes: https://github.com/gentoo/portage/pull/616
Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
man/make.conf.5 | 4 ++--
man/portage.5 | 15 +++++++--------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/man/make.conf.5 b/man/make.conf.5
index eb812150f..1b997ad37 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -15,8 +15,8 @@ the Simple lexical analysis documentation:
\fIhttps://docs.python.org/3/library/shlex.html\fR. Note that if you source
files, they need to be in the same shlex syntax for portage to read them.
If make.conf is a directory, then all the files in that directory will
-be sorted in ascending alphabetical order by file name and summed
-together as if it were a single file.
+be sorted in lexical order by file name and summed together as if it were
+a single file.
.br
Portage will check the currently\-defined environment variables
first for any settings. If no environment settings are found,
diff --git a/man/portage.5 b/man/portage.5
index 7472972cc..db6e9ba76 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -229,8 +229,8 @@ will be preferred.
Any file in this directory, directories of other profiles or top-level
"profiles" directory that begins with "package." or "use." can be more than
just a flat file. If it is a directory, then all the files in that directory
-will be sorted in ascending alphabetical order by file name and summed together
-as if it were a single file. Note that this behavior is only supported since
+will be sorted in lexical order by file name and summed together as if
+it were a single file. Note that this behavior is only supported since
portage-2.1.6.7, and it is not included in PMS at this time.
.I Example:
@@ -602,8 +602,8 @@ virtual/aspell\-dict app\-dicts/aspell\-en
Files in this directory including make.conf, repos.conf, and any file
with a name that begins with "package." can be
more than just a flat file. If it is a directory, then all the files in that
-directory will be sorted in ascending alphabetical order by file name and
summed
-together as if it were a single file.
+directory will be sorted in lexical order by file name and summed together
+as if it were a single file.
.I Example:
.nf
@@ -843,15 +843,14 @@ x11\-libs/qt \-mysql
.TP
.BR postsync.d/
This directory is for user supplied postsync hooks to be run once after all
-repositories have been synced. Each script is called in alphabetic order
+repositories have been synced. Each script is called in lexical order
without any arguments.
.fi
.TP
.BR repo.postsync.d/
This directory is for user supplied postsync hooks to be run once after each
-repository has been synced. Each script is called in alphabetic order
-with three arguments.
-
+repository has been synced. Each script is called in lexical order
+with the following three arguments:
.I args:
repository name, sync-uri, location
.fi
