Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/tests/, lib/portage/util/, bin/, /
Date: Mon, 21 Feb 2022 03:51:56
Message-Id: 1645415445.41f4f6d25019c4f944b8d9576d96482f92231fda.sam@gentoo
1 commit: 41f4f6d25019c4f944b8d9576d96482f92231fda
2 Author: John Helmert III <ajak <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 10 01:30:06 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 21 03:50:45 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=41f4f6d2
7
8 Use '/usr/bin/env python' shebangs
9
10 Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 bin/archive-conf | 2 +-
14 bin/binhost-snapshot | 2 +-
15 bin/check-implicit-pointer-usage.py | 2 +-
16 bin/chmod-lite.py | 2 +-
17 bin/chpathtool.py | 2 +-
18 bin/clean_locks | 2 +-
19 bin/dispatch-conf | 2 +-
20 bin/dohtml.py | 2 +-
21 bin/doins.py | 2 +-
22 bin/ebuild | 2 +-
23 bin/ebuild-ipc.py | 2 +-
24 bin/egencache | 2 +-
25 bin/emaint | 2 +-
26 bin/emerge | 2 +-
27 bin/emirrordist | 2 +-
28 bin/env-update | 2 +-
29 bin/filter-bash-environment.py | 2 +-
30 bin/fixpackages | 2 +-
31 bin/glsa-check | 2 +-
32 bin/gpkg-helper.py | 2 +-
33 bin/install.py | 2 +-
34 bin/lock-helper.py | 2 +-
35 bin/portageq | 2 +-
36 bin/quickpkg | 2 +-
37 bin/regenworld | 2 +-
38 bin/shelve-utils | 2 +-
39 bin/xattr-helper.py | 2 +-
40 bin/xpak-helper.py | 2 +-
41 lib/portage/tests/runTests.py | 2 +-
42 lib/portage/util/changelog.py | 2 +-
43 runtests | 2 +-
44 tabcheck.py | 2 +-
45 32 files changed, 32 insertions(+), 32 deletions(-)
46
47 diff --git a/bin/archive-conf b/bin/archive-conf
48 index bfc54a629..3b31ebe1a 100755
49 --- a/bin/archive-conf
50 +++ b/bin/archive-conf
51 @@ -1,4 +1,4 @@
52 -#!/usr/bin/python -b
53 +#!/usr/bin/env python -b
54 # Copyright 1999-2020 Gentoo Authors
55 # Distributed under the terms of the GNU General Public License v2
56
57
58 diff --git a/bin/binhost-snapshot b/bin/binhost-snapshot
59 index afab23592..2201781d6 100755
60 --- a/bin/binhost-snapshot
61 +++ b/bin/binhost-snapshot
62 @@ -1,4 +1,4 @@
63 -#!/usr/bin/python -b
64 +#!/usr/bin/env python -b
65 # Copyright 2010-2014 Gentoo Foundation
66 # Distributed under the terms of the GNU General Public License v2
67
68
69 diff --git a/bin/check-implicit-pointer-usage.py b/bin/check-implicit-pointer-usage.py
70 index a3590e765..61eecd65b 100755
71 --- a/bin/check-implicit-pointer-usage.py
72 +++ b/bin/check-implicit-pointer-usage.py
73 @@ -1,4 +1,4 @@
74 -#!/usr/bin/python -b
75 +#!/usr/bin/env python -b
76
77 # Ripped from HP and updated from Debian
78 # Update by Gentoo to support unicode output
79
80 diff --git a/bin/chmod-lite.py b/bin/chmod-lite.py
81 index fc2194ed5..602b3600b 100755
82 --- a/bin/chmod-lite.py
83 +++ b/bin/chmod-lite.py
84 @@ -1,4 +1,4 @@
85 -#!/usr/bin/python -b
86 +#!/usr/bin/env python -b
87 # Copyright 2015 Gentoo Foundation
88 # Distributed under the terms of the GNU General Public License v2
89
90
91 diff --git a/bin/chpathtool.py b/bin/chpathtool.py
92 index 7e9813b92..2d4993716 100755
93 --- a/bin/chpathtool.py
94 +++ b/bin/chpathtool.py
95 @@ -1,4 +1,4 @@
96 -#!/usr/bin/python -b
97 +#!/usr/bin/env python -b
98 # Copyright 2011-2014 Gentoo Foundation
99 # Distributed under the terms of the GNU General Public License v2
100
101
102 diff --git a/bin/clean_locks b/bin/clean_locks
103 index e5765fd7e..6618f58da 100755
104 --- a/bin/clean_locks
105 +++ b/bin/clean_locks
106 @@ -1,4 +1,4 @@
107 -#!/usr/bin/python -b
108 +#!/usr/bin/env python -b
109 # Copyright 1999-2021 Gentoo Authors
110 # Distributed under the terms of the GNU General Public License v2
111
112
113 diff --git a/bin/dispatch-conf b/bin/dispatch-conf
114 index f36815a52..a4ca80ba9 100755
115 --- a/bin/dispatch-conf
116 +++ b/bin/dispatch-conf
117 @@ -1,4 +1,4 @@
118 -#!/usr/bin/python -b
119 +#!/usr/bin/env python -b
120 # Copyright 1999-2021 Gentoo Authors
121 # Distributed under the terms of the GNU General Public License v2
122
123
124 diff --git a/bin/dohtml.py b/bin/dohtml.py
125 index c7235ff4e..e7cfa591e 100755
126 --- a/bin/dohtml.py
127 +++ b/bin/dohtml.py
128 @@ -1,4 +1,4 @@
129 -#!/usr/bin/python -b
130 +#!/usr/bin/env python -b
131 # Copyright 1999-2020 Gentoo Authors
132 # Distributed under the terms of the GNU General Public License v2
133
134
135 diff --git a/bin/doins.py b/bin/doins.py
136 index 97b0e2e2f..42ea25078 100644
137 --- a/bin/doins.py
138 +++ b/bin/doins.py
139 @@ -1,4 +1,4 @@
140 -#!/usr/bin/python -b
141 +#!/usr/bin/env python -b
142 # Copyright 2017-2020 Gentoo Authors
143 # Distributed under the terms of the GNU General Public License v2
144 #
145
146 diff --git a/bin/ebuild b/bin/ebuild
147 index 0a2b13a13..3ad589008 100755
148 --- a/bin/ebuild
149 +++ b/bin/ebuild
150 @@ -1,4 +1,4 @@
151 -#!/usr/bin/python -b
152 +#!/usr/bin/env python -b
153 # Copyright 1999-2021 Gentoo Authors
154 # Distributed under the terms of the GNU General Public License v2
155
156
157 diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py
158 index c24ba6f58..62e71677b 100755
159 --- a/bin/ebuild-ipc.py
160 +++ b/bin/ebuild-ipc.py
161 @@ -1,4 +1,4 @@
162 -#!/usr/bin/python -b
163 +#!/usr/bin/env python -b
164 # Copyright 2010-2021 Gentoo Authors
165 # Distributed under the terms of the GNU General Public License v2
166 #
167
168 diff --git a/bin/egencache b/bin/egencache
169 index fc18b892f..b590a5529 100755
170 --- a/bin/egencache
171 +++ b/bin/egencache
172 @@ -1,4 +1,4 @@
173 -#!/usr/bin/python -b
174 +#!/usr/bin/env python -b
175 # Copyright 2009-2021 Gentoo Authors
176 # Distributed under the terms of the GNU General Public License v2
177
178
179 diff --git a/bin/emaint b/bin/emaint
180 index 5cb667f28..feef8d7e8 100755
181 --- a/bin/emaint
182 +++ b/bin/emaint
183 @@ -1,4 +1,4 @@
184 -#!/usr/bin/python -b
185 +#!/usr/bin/env python -b
186 # Copyright 2005-2020 Gentoo Authors
187 # Distributed under the terms of the GNU General Public License v2
188
189
190 diff --git a/bin/emerge b/bin/emerge
191 index 813d7bae5..33ece427c 100755
192 --- a/bin/emerge
193 +++ b/bin/emerge
194 @@ -1,4 +1,4 @@
195 -#!/usr/bin/python -b
196 +#!/usr/bin/env python -b
197 # Copyright 2006-2021 Gentoo Authors
198 # Distributed under the terms of the GNU General Public License v2
199
200
201 diff --git a/bin/emirrordist b/bin/emirrordist
202 index 3ea08379e..626a055e7 100755
203 --- a/bin/emirrordist
204 +++ b/bin/emirrordist
205 @@ -1,4 +1,4 @@
206 -#!/usr/bin/python -b
207 +#!/usr/bin/env python -b
208 # Copyright 2013-2014 Gentoo Foundation
209 # Distributed under the terms of the GNU General Public License v2
210
211
212 diff --git a/bin/env-update b/bin/env-update
213 index 6571b0011..f3851afaf 100755
214 --- a/bin/env-update
215 +++ b/bin/env-update
216 @@ -1,4 +1,4 @@
217 -#!/usr/bin/python -b
218 +#!/usr/bin/env python -b
219 # Copyright 1999-2020 Gentoo Authors
220 # Distributed under the terms of the GNU General Public License v2
221
222
223 diff --git a/bin/filter-bash-environment.py b/bin/filter-bash-environment.py
224 index 5ec795999..08b3d23ad 100755
225 --- a/bin/filter-bash-environment.py
226 +++ b/bin/filter-bash-environment.py
227 @@ -1,4 +1,4 @@
228 -#!/usr/bin/python -b
229 +#!/usr/bin/env python -b
230 # Copyright 1999-2014 Gentoo Foundation
231 # Distributed under the terms of the GNU General Public License v2
232
233
234 diff --git a/bin/fixpackages b/bin/fixpackages
235 index e56d26ec1..eab4b3959 100755
236 --- a/bin/fixpackages
237 +++ b/bin/fixpackages
238 @@ -1,4 +1,4 @@
239 -#!/usr/bin/python -b
240 +#!/usr/bin/env python -b
241 # Copyright 1999-2020 Gentoo Authors
242 # Distributed under the terms of the GNU General Public License v2
243
244
245 diff --git a/bin/glsa-check b/bin/glsa-check
246 index c8610f7df..165123fd0 100755
247 --- a/bin/glsa-check
248 +++ b/bin/glsa-check
249 @@ -1,4 +1,4 @@
250 -#!/usr/bin/python -b
251 +#!/usr/bin/env python -b
252 # Copyright 1999-2021 Gentoo Authors
253 # Distributed under the terms of the GNU General Public License v2
254
255
256 diff --git a/bin/gpkg-helper.py b/bin/gpkg-helper.py
257 index d79430212..0ea4c557a 100755
258 --- a/bin/gpkg-helper.py
259 +++ b/bin/gpkg-helper.py
260 @@ -1,4 +1,4 @@
261 -#!/usr/bin/python -b
262 +#!/usr/bin/env python -b
263 # Copyright 2020 Gentoo Authors
264 # Distributed under the terms of the GNU General Public License v2
265
266
267 diff --git a/bin/install.py b/bin/install.py
268 index d6faeb6a4..e42a8481f 100755
269 --- a/bin/install.py
270 +++ b/bin/install.py
271 @@ -1,4 +1,4 @@
272 -#!/usr/bin/python -b
273 +#!/usr/bin/env python -b
274 # Copyright 2013-2014 Gentoo Foundation
275 # Distributed under the terms of the GNU General Public License v2
276
277
278 diff --git a/bin/lock-helper.py b/bin/lock-helper.py
279 index 4f56610c0..1aad84d41 100755
280 --- a/bin/lock-helper.py
281 +++ b/bin/lock-helper.py
282 @@ -1,4 +1,4 @@
283 -#!/usr/bin/python -b
284 +#!/usr/bin/env python -b
285 # Copyright 2010-2014 Gentoo Foundation
286 # Distributed under the terms of the GNU General Public License v2
287
288
289 diff --git a/bin/portageq b/bin/portageq
290 index d3cb9f140..1c7e27a99 100755
291 --- a/bin/portageq
292 +++ b/bin/portageq
293 @@ -1,4 +1,4 @@
294 -#!/usr/bin/python -b
295 +#!/usr/bin/env python -b
296 # Copyright 1999-2021 Gentoo Authors
297 # Distributed under the terms of the GNU General Public License v2
298
299
300 diff --git a/bin/quickpkg b/bin/quickpkg
301 index 27dda85ed..7a3304ca4 100755
302 --- a/bin/quickpkg
303 +++ b/bin/quickpkg
304 @@ -1,4 +1,4 @@
305 -#!/usr/bin/python -b
306 +#!/usr/bin/env python -b
307 # Copyright 1999-2021 Gentoo Authors
308 # Distributed under the terms of the GNU General Public License v2
309
310
311 diff --git a/bin/regenworld b/bin/regenworld
312 index a5ee1580d..e3577a103 100755
313 --- a/bin/regenworld
314 +++ b/bin/regenworld
315 @@ -1,4 +1,4 @@
316 -#!/usr/bin/python -b
317 +#!/usr/bin/env python -b
318 # Copyright 1999-2021 Gentoo Authors
319 # Distributed under the terms of the GNU General Public License v2
320
321
322 diff --git a/bin/shelve-utils b/bin/shelve-utils
323 index 83daeccbc..6cfa36a81 100755
324 --- a/bin/shelve-utils
325 +++ b/bin/shelve-utils
326 @@ -1,4 +1,4 @@
327 -#!/usr/bin/python -b
328 +#!/usr/bin/env python -b
329 # Copyright 2020-2021 Gentoo Authors
330 # Distributed under the terms of the GNU General Public License v2
331
332
333 diff --git a/bin/xattr-helper.py b/bin/xattr-helper.py
334 index 9d519b61c..c134a6d75 100755
335 --- a/bin/xattr-helper.py
336 +++ b/bin/xattr-helper.py
337 @@ -1,4 +1,4 @@
338 -#!/usr/bin/python -b
339 +#!/usr/bin/env python -b
340 # Copyright 2012-2018 Gentoo Foundation
341 # Distributed under the terms of the GNU General Public License v2
342
343
344 diff --git a/bin/xpak-helper.py b/bin/xpak-helper.py
345 index f656a1357..f900081e8 100755
346 --- a/bin/xpak-helper.py
347 +++ b/bin/xpak-helper.py
348 @@ -1,4 +1,4 @@
349 -#!/usr/bin/python -b
350 +#!/usr/bin/env python -b
351 # Copyright 2009-2014 Gentoo Foundation
352 # Distributed under the terms of the GNU General Public License v2
353
354
355 diff --git a/lib/portage/tests/runTests.py b/lib/portage/tests/runTests.py
356 index 167b40d5a..6e97bd2e7 100755
357 --- a/lib/portage/tests/runTests.py
358 +++ b/lib/portage/tests/runTests.py
359 @@ -1,4 +1,4 @@
360 -#!/usr/bin/python -bWd
361 +#!/usr/bin/env python -bWd
362 # runTests.py -- Portage Unit Test Functionality
363 # Copyright 2006-2020 Gentoo Authors
364 # Distributed under the terms of the GNU General Public License v2
365
366 diff --git a/lib/portage/util/changelog.py b/lib/portage/util/changelog.py
367 index db42de812..ea41b23cf 100644
368 --- a/lib/portage/util/changelog.py
369 +++ b/lib/portage/util/changelog.py
370 @@ -1,4 +1,4 @@
371 -#!/usr/bin/python -b
372 +#!/usr/bin/env python -b
373 # Copyright 2009-2020 Gentoo Authors
374 # Distributed under the terms of the GNU General Public License v2
375
376
377 diff --git a/runtests b/runtests
378 index 4a54c0425..bc3105026 100755
379 --- a/runtests
380 +++ b/runtests
381 @@ -1,4 +1,4 @@
382 -#!/usr/bin/python
383 +#!/usr/bin/env python
384 # Copyright 2010-2020 Gentoo Authors
385 # Distributed under the terms of the GNU General Public License v2
386 #
387
388 diff --git a/tabcheck.py b/tabcheck.py
389 index b02e4f052..f8d56cf1e 100755
390 --- a/tabcheck.py
391 +++ b/tabcheck.py
392 @@ -1,4 +1,4 @@
393 -#!/usr/bin/python -b
394 +#!/usr/bin/env python -b
395
396 import sys
397 import tabnanny