From 781aefd8be33c3bd699e5a665225013c5f76b531 Mon Sep 17 00:00:00 2001 From: John Helmert III Date: Wed, 9 Mar 2022 13:48:11 -0600 Subject: Drop -b from shebangs The switch to using '/usr/bin/env python' shebangs doesn't naively work with arguments after 'python', so the shebangs were broken. '-b' is of dubious necessity anyway, so let's just drop it. Fixes: 41f4f6d25019c4f944b8d9576d96482f92231fda Signed-off-by: John Helmert III Signed-off-by: Mike Gilbert --- bin/archive-conf | 2 +- bin/binhost-snapshot | 2 +- bin/check-implicit-pointer-usage.py | 2 +- bin/chmod-lite.py | 2 +- bin/chpathtool.py | 2 +- bin/clean_locks | 2 +- bin/dispatch-conf | 2 +- bin/dohtml.py | 2 +- bin/doins.py | 2 +- bin/ebuild | 2 +- bin/ebuild-ipc.py | 2 +- bin/egencache | 2 +- bin/emaint | 2 +- bin/emerge | 2 +- bin/emirrordist | 2 +- bin/env-update | 2 +- bin/filter-bash-environment.py | 2 +- bin/fixpackages | 2 +- bin/glsa-check | 2 +- bin/gpkg-helper.py | 2 +- bin/install.py | 2 +- bin/lock-helper.py | 2 +- bin/portageq | 2 +- bin/quickpkg | 2 +- bin/regenworld | 2 +- bin/shelve-utils | 2 +- bin/xattr-helper.py | 2 +- bin/xpak-helper.py | 2 +- lib/portage/tests/runTests.py | 2 +- lib/portage/util/changelog.py | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/bin/archive-conf b/bin/archive-conf index beb4fcd23..3f7d186fe 100755 --- a/bin/archive-conf +++ b/bin/archive-conf @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/binhost-snapshot b/bin/binhost-snapshot index 3461a301c..4022cb32c 100755 --- a/bin/binhost-snapshot +++ b/bin/binhost-snapshot @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 2010-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/check-implicit-pointer-usage.py b/bin/check-implicit-pointer-usage.py index 61eecd65b..06b666c88 100755 --- a/bin/check-implicit-pointer-usage.py +++ b/bin/check-implicit-pointer-usage.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Ripped from HP and updated from Debian # Update by Gentoo to support unicode output diff --git a/bin/chmod-lite.py b/bin/chmod-lite.py index 602b3600b..517a55bd9 100755 --- a/bin/chmod-lite.py +++ b/bin/chmod-lite.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/chpathtool.py b/bin/chpathtool.py index 2d4993716..d658e5012 100755 --- a/bin/chpathtool.py +++ b/bin/chpathtool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 2011-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/clean_locks b/bin/clean_locks index 88e1b3325..b80213911 100755 --- a/bin/clean_locks +++ b/bin/clean_locks @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/dispatch-conf b/bin/dispatch-conf index c0e7ffc1e..9490197d3 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/dohtml.py b/bin/dohtml.py index e7cfa591e..86cda72aa 100755 --- a/bin/dohtml.py +++ b/bin/dohtml.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/doins.py b/bin/doins.py index 42ea25078..087756218 100644 --- a/bin/doins.py +++ b/bin/doins.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 2017-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # diff --git a/bin/ebuild b/bin/ebuild index bdedab9cb..bab8d52ad 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py index 62e71677b..bc5dda27d 100755 --- a/bin/ebuild-ipc.py +++ b/bin/ebuild-ipc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 2010-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # diff --git a/bin/egencache b/bin/egencache index 2b523c7b3..842f453ea 100755 --- a/bin/egencache +++ b/bin/egencache @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 2009-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/emaint b/bin/emaint index bd7b9083c..b9a129ed0 100755 --- a/bin/emaint +++ b/bin/emaint @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 2005-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/emerge b/bin/emerge index a407b9d6c..d1a8d9f52 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 2006-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/emirrordist b/bin/emirrordist index 35060213f..9f8db8292 100755 --- a/bin/emirrordist +++ b/bin/emirrordist @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 2013-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/env-update b/bin/env-update index c0de199e6..8e597b03d 100755 --- a/bin/env-update +++ b/bin/env-update @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/filter-bash-environment.py b/bin/filter-bash-environment.py index 08b3d23ad..86cb22948 100755 --- a/bin/filter-bash-environment.py +++ b/bin/filter-bash-environment.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/fixpackages b/bin/fixpackages index 34aaa786e..6f78b174d 100755 --- a/bin/fixpackages +++ b/bin/fixpackages @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/glsa-check b/bin/glsa-check index 93d9efe18..431590cf8 100755 --- a/bin/glsa-check +++ b/bin/glsa-check @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/gpkg-helper.py b/bin/gpkg-helper.py index 0ea4c557a..d45177f3e 100755 --- a/bin/gpkg-helper.py +++ b/bin/gpkg-helper.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/install.py b/bin/install.py index e42a8481f..4bdffd255 100755 --- a/bin/install.py +++ b/bin/install.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 2013-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/lock-helper.py b/bin/lock-helper.py index 1aad84d41..6619d625a 100755 --- a/bin/lock-helper.py +++ b/bin/lock-helper.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 2010-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/portageq b/bin/portageq index 8338d4e14..73657650c 100755 --- a/bin/portageq +++ b/bin/portageq @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/quickpkg b/bin/quickpkg index a4a3584da..b4ad43376 100755 --- a/bin/quickpkg +++ b/bin/quickpkg @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/regenworld b/bin/regenworld index fd11ed14a..7927dd237 100755 --- a/bin/regenworld +++ b/bin/regenworld @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/shelve-utils b/bin/shelve-utils index 3c513bd17..afe021b3a 100755 --- a/bin/shelve-utils +++ b/bin/shelve-utils @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/xattr-helper.py b/bin/xattr-helper.py index c134a6d75..6e50ac487 100755 --- a/bin/xattr-helper.py +++ b/bin/xattr-helper.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/xpak-helper.py b/bin/xpak-helper.py index f900081e8..ac29995e7 100755 --- a/bin/xpak-helper.py +++ b/bin/xpak-helper.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 2009-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/lib/portage/tests/runTests.py b/lib/portage/tests/runTests.py index 6e97bd2e7..00a8ad7bb 100755 --- a/lib/portage/tests/runTests.py +++ b/lib/portage/tests/runTests.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -bWd +#!/usr/bin/env python -Wd # runTests.py -- Portage Unit Test Functionality # Copyright 2006-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/lib/portage/util/changelog.py b/lib/portage/util/changelog.py index ea41b23cf..9aeb6fe1a 100644 --- a/lib/portage/util/changelog.py +++ b/lib/portage/util/changelog.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -b +#!/usr/bin/env python # Copyright 2009-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -- cgit v1.2.3-65-gdbad