Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: man/, lib/_emerge/, lib/portage/util/, lib/portage/package/ebuild/_config/, ...
Date: Sun, 22 Nov 2020 00:36:17
Message-Id: 1606005349.222adeecbd72f070eaa05e39b0951cabd6ba8026.zmedico@gentoo
1 commit: 222adeecbd72f070eaa05e39b0951cabd6ba8026
2 Author: Petr Šabata <contyk <AT> redhat <DOT> com>
3 AuthorDate: Sat Nov 7 11:55:46 2020 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 22 00:35:49 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=222adeec
7
8 Typofix: Use just one definite article
9
10 I first noticed this in make.conf(5) but it turned out there were many
11 more occurences of these; fixed with find & sed.
12
13 Closes: https://github.com/gentoo/portage/pull/634
14 Signed-off-by: Petr Šabata <contyk <AT> redhat.com>
15 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
16
17 doc/package/ebuild/eapi/4.docbook | 2 +-
18 lib/_emerge/depgraph.py | 2 +-
19 lib/portage/cache/template.py | 2 +-
20 lib/portage/package/ebuild/_config/KeywordsManager.py | 2 +-
21 lib/portage/package/ebuild/_config/UseManager.py | 4 ++--
22 lib/portage/package/ebuild/config.py | 2 +-
23 lib/portage/util/netlink.py | 2 +-
24 man/make.conf.5 | 2 +-
25 8 files changed, 9 insertions(+), 9 deletions(-)
26
27 diff --git a/doc/package/ebuild/eapi/4.docbook b/doc/package/ebuild/eapi/4.docbook
28 index 8dd0f1487..9120c0ff0 100644
29 --- a/doc/package/ebuild/eapi/4.docbook
30 +++ b/doc/package/ebuild/eapi/4.docbook
31 @@ -153,7 +153,7 @@ This new REQUIRED_USE metadata key is used to specify what USE flag combinations
32 It's a semi common occurrence that an ebuild may need to state that they disallow USE flags in specific combinations- either mysql or sqlite for example, but not both.
33 </para>
34 <para>
35 -Existing solutions rely on checking the the USE configuration in pkg_setup which is non-optimal due to pkg_setup being ran potentially hours after the initial emerge -p invocation.
36 +Existing solutions rely on checking the USE configuration in pkg_setup which is non-optimal due to pkg_setup being ran potentially hours after the initial emerge -p invocation.
37 </para>
38 <para>
39 Current versions of EAPI4 support a phase hook pkg_pretend that is intended to move pre-build checks to just after resolution. It has been proposed that pkg_pretend should continue the tradition of adhoc shell code validating the USE state- this too is non optimal for the following reasons-
40
41 diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
42 index 6aaacfe44..a994caea7 100644
43 --- a/lib/_emerge/depgraph.py
44 +++ b/lib/_emerge/depgraph.py
45 @@ -10061,7 +10061,7 @@ def _resume_depgraph(settings, trees, mtimedb, myopts, myparams, spinner):
46
47 # If this package was pulled in by a parent
48 # package scheduled for merge, removing this
49 - # package may cause the the parent package's
50 + # package may cause the parent package's
51 # dependency to become unsatisfied.
52 for parent_node, atom in \
53 mydepgraph._dynamic_config._parent_atoms.get(pkg, []):
54
55 diff --git a/lib/portage/cache/template.py b/lib/portage/cache/template.py
56 index 31a4acc44..55b8dc40c 100644
57 --- a/lib/portage/cache/template.py
58 +++ b/lib/portage/cache/template.py
59 @@ -293,7 +293,7 @@ def serialize_eclasses(eclass_dict, chf_type='mtime', paths=True):
60 """takes a dict, returns a string representing said dict"""
61 """The "new format", which causes older versions of <portage-2.1.2 to
62 traceback with a ValueError due to failed int() conversion. This format
63 - isn't currently written, but the the capability to read it is already built
64 + isn't currently written, but the capability to read it is already built
65 in.
66 return "\t".join(["%s\t%s" % (k, str(v)) \
67 for k, v in eclass_dict.iteritems()])
68
69 diff --git a/lib/portage/package/ebuild/_config/KeywordsManager.py b/lib/portage/package/ebuild/_config/KeywordsManager.py
70 index de9cdaede..bf68a88ac 100644
71 --- a/lib/portage/package/ebuild/_config/KeywordsManager.py
72 +++ b/lib/portage/package/ebuild/_config/KeywordsManager.py
73 @@ -144,7 +144,7 @@ class KeywordsManager:
74 """
75 Take a package and return a list of any KEYWORDS that the user may
76 need to accept for the given package. If the KEYWORDS are empty
77 - and the the ** keyword has not been accepted, the returned list will
78 + and the ** keyword has not been accepted, the returned list will
79 contain ** alone (in order to distinguish from the case of "none
80 missing").
81
82
83 diff --git a/lib/portage/package/ebuild/_config/UseManager.py b/lib/portage/package/ebuild/_config/UseManager.py
84 index 190ab1b7c..882b0efa9 100644
85 --- a/lib/portage/package/ebuild/_config/UseManager.py
86 +++ b/lib/portage/package/ebuild/_config/UseManager.py
87 @@ -116,7 +116,7 @@ class UseManager:
88 directory
89 @type recursive: bool
90 @param eapi_filter: a function that accepts a single eapi
91 - argument, and returns true if the the current file type
92 + argument, and returns true if the current file type
93 is supported by the given EAPI
94 @type eapi_filter: callable
95 @param eapi: the EAPI of the current profile node, which allows
96 @@ -165,7 +165,7 @@ class UseManager:
97 directory
98 @type recursive: bool
99 @param eapi_filter: a function that accepts a single eapi
100 - argument, and returns true if the the current file type
101 + argument, and returns true if the current file type
102 is supported by the given EAPI
103 @type eapi_filter: callable
104 @param user_config: current file is part of the local
105
106 diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
107 index a188c700d..e5ec681af 100644
108 --- a/lib/portage/package/ebuild/config.py
109 +++ b/lib/portage/package/ebuild/config.py
110 @@ -2033,7 +2033,7 @@ class config:
111 """
112 Take a package and return a list of any KEYWORDS that the user may
113 need to accept for the given package. If the KEYWORDS are empty
114 - and the the ** keyword has not been accepted, the returned list will
115 + and the ** keyword has not been accepted, the returned list will
116 contain ** alone (in order to distinguish from the case of "none
117 missing").
118
119
120 diff --git a/lib/portage/util/netlink.py b/lib/portage/util/netlink.py
121 index ad9e8ca30..ac0e2c08b 100644
122 --- a/lib/portage/util/netlink.py
123 +++ b/lib/portage/util/netlink.py
124 @@ -70,7 +70,7 @@ class RtNetlink:
125
126 def send_message(self, msg):
127 self.sock.sendto(msg, self.addr)
128 - # Messages are variable length, but 128 is enough for the the ones we care about.
129 + # Messages are variable length, but 128 is enough for the ones we care about.
130 resp = self.sock.recv(128)
131 return parse_message(resp)
132
133
134 diff --git a/man/make.conf.5 b/man/make.conf.5
135 index 403465fad..494d5a212 100644
136 --- a/man/make.conf.5
137 +++ b/man/make.conf.5
138 @@ -529,7 +529,7 @@ the corresponding ebuild and eclasses to be sourced again for each phase, in
139 order to account for modifications.
140 .TP
141 .B noclean
142 -Do not delete the the source and temporary files after the merge process.
143 +Do not delete the source and temporary files after the merge process.
144 .TP
145 .B nodoc
146 Do not install doc files (/usr/share/doc).