1 |
commit: f1f9062578936d68040490a8122ccf84c087030a |
2 |
Author: Michael Everitt <gentoo <AT> veremit <DOT> xyz> |
3 |
AuthorDate: Sun Sep 6 00:05:59 2020 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 7 23:40:32 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f1f90625 |
7 |
|
8 |
man/{portage,make.conf}.5: Files in subdirs are parsed in lexical order |
9 |
|
10 |
Most files in packages.*, make.conf/*, *.postsync.d/* are parsed not just in |
11 |
ascending alphabetical order, but actually in lexographical (lexical) order, |
12 |
which means alpha-numerically + symbols. |
13 |
|
14 |
Closes: https://github.com/gentoo/portage/pull/616 |
15 |
Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz> |
16 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
17 |
|
18 |
man/make.conf.5 | 4 ++-- |
19 |
man/portage.5 | 15 +++++++-------- |
20 |
2 files changed, 9 insertions(+), 10 deletions(-) |
21 |
|
22 |
diff --git a/man/make.conf.5 b/man/make.conf.5 |
23 |
index eb812150f..1b997ad37 100644 |
24 |
--- a/man/make.conf.5 |
25 |
+++ b/man/make.conf.5 |
26 |
@@ -15,8 +15,8 @@ the Simple lexical analysis documentation: |
27 |
\fIhttps://docs.python.org/3/library/shlex.html\fR. Note that if you source |
28 |
files, they need to be in the same shlex syntax for portage to read them. |
29 |
If make.conf is a directory, then all the files in that directory will |
30 |
-be sorted in ascending alphabetical order by file name and summed |
31 |
-together as if it were a single file. |
32 |
+be sorted in lexical order by file name and summed together as if it were |
33 |
+a single file. |
34 |
.br |
35 |
Portage will check the currently\-defined environment variables |
36 |
first for any settings. If no environment settings are found, |
37 |
|
38 |
diff --git a/man/portage.5 b/man/portage.5 |
39 |
index 7472972cc..db6e9ba76 100644 |
40 |
--- a/man/portage.5 |
41 |
+++ b/man/portage.5 |
42 |
@@ -229,8 +229,8 @@ will be preferred. |
43 |
Any file in this directory, directories of other profiles or top-level |
44 |
"profiles" directory that begins with "package." or "use." can be more than |
45 |
just a flat file. If it is a directory, then all the files in that directory |
46 |
-will be sorted in ascending alphabetical order by file name and summed together |
47 |
-as if it were a single file. Note that this behavior is only supported since |
48 |
+will be sorted in lexical order by file name and summed together as if |
49 |
+it were a single file. Note that this behavior is only supported since |
50 |
portage-2.1.6.7, and it is not included in PMS at this time. |
51 |
|
52 |
.I Example: |
53 |
@@ -602,8 +602,8 @@ virtual/aspell\-dict app\-dicts/aspell\-en |
54 |
Files in this directory including make.conf, repos.conf, and any file |
55 |
with a name that begins with "package." can be |
56 |
more than just a flat file. If it is a directory, then all the files in that |
57 |
-directory will be sorted in ascending alphabetical order by file name and summed |
58 |
-together as if it were a single file. |
59 |
+directory will be sorted in lexical order by file name and summed together |
60 |
+as if it were a single file. |
61 |
|
62 |
.I Example: |
63 |
.nf |
64 |
@@ -843,15 +843,14 @@ x11\-libs/qt \-mysql |
65 |
.TP |
66 |
.BR postsync.d/ |
67 |
This directory is for user supplied postsync hooks to be run once after all |
68 |
-repositories have been synced. Each script is called in alphabetic order |
69 |
+repositories have been synced. Each script is called in lexical order |
70 |
without any arguments. |
71 |
.fi |
72 |
.TP |
73 |
.BR repo.postsync.d/ |
74 |
This directory is for user supplied postsync hooks to be run once after each |
75 |
-repository has been synced. Each script is called in alphabetic order |
76 |
-with three arguments. |
77 |
- |
78 |
+repository has been synced. Each script is called in lexical order |
79 |
+with the following three arguments: |
80 |
.I args: |
81 |
repository name, sync-uri, location |
82 |
.fi |