Skip to content

Commit 1334caa

Browse files
committed
bin: add if __name__ == "__main__" for python 3.14
Bug: https://bugs.gentoo.org/965514 Signed-off-by: Zac Medico <[email protected]>
1 parent 88a4a0c commit 1334caa

File tree

9 files changed

+96
-87
lines changed

9 files changed

+96
-87
lines changed

bin/eclean

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ except KeyboardInterrupt:
3737

3838
from gentoolkit.eclean.cli import main
3939

40-
try:
41-
main()
42-
except KeyboardInterrupt:
43-
print("Aborted.")
44-
sys.exit(130)
45-
sys.exit(0)
40+
if __name__ == "__main__":
41+
try:
42+
main()
43+
except KeyboardInterrupt:
44+
print("Aborted.")
45+
sys.exit(130)
46+
sys.exit(0)

bin/eclean-dist

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ except KeyboardInterrupt:
3737

3838
from gentoolkit.eclean.cli import main
3939

40-
try:
41-
main()
42-
except KeyboardInterrupt:
43-
print("Aborted.")
44-
sys.exit(130)
45-
sys.exit(0)
40+
if __name__ == "__main__":
41+
try:
42+
main()
43+
except KeyboardInterrupt:
44+
print("Aborted.")
45+
sys.exit(130)
46+
sys.exit(0)

bin/eclean-pkg

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ except KeyboardInterrupt:
3737

3838
from gentoolkit.eclean.cli import main
3939

40-
try:
41-
main()
42-
except KeyboardInterrupt:
43-
print("Aborted.")
44-
sys.exit(130)
45-
sys.exit(0)
40+
if __name__ == "__main__":
41+
try:
42+
main()
43+
except KeyboardInterrupt:
44+
print("Aborted.")
45+
sys.exit(130)
46+
sys.exit(0)

bin/ekeyword

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ except KeyboardInterrupt:
3333

3434
from gentoolkit.ekeyword import ekeyword
3535

36-
try:
37-
ekeyword.main(sys.argv[1:])
38-
except KeyboardInterrupt:
39-
print("Aborted.")
40-
sys.exit(130)
41-
sys.exit(0)
36+
if __name__ == "__main__":
37+
try:
38+
ekeyword.main(sys.argv[1:])
39+
except KeyboardInterrupt:
40+
print("Aborted.")
41+
sys.exit(130)
42+
sys.exit(0)

bin/enalyze

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@ except KeyboardInterrupt:
3131

3232
from gentoolkit import enalyze, errors
3333

34-
try:
35-
enalyze.main()
36-
except errors.GentoolkitException as err:
37-
if '--debug' in sys.argv:
38-
raise
39-
else:
40-
from gentoolkit import pprinter as pp
41-
sys.stderr.write(pp.error(str(err)))
42-
print()
43-
print("Add '--debug' to global options for traceback.")
44-
sys.exit(1)
34+
if __name__ == "__main__":
35+
try:
36+
enalyze.main()
37+
except errors.GentoolkitException as err:
38+
if '--debug' in sys.argv:
39+
raise
40+
else:
41+
from gentoolkit import pprinter as pp
42+
sys.stderr.write(pp.error(str(err)))
43+
print()
44+
print("Add '--debug' to global options for traceback.")
45+
sys.exit(1)

bin/epkginfo

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,28 @@ def print_epkginfo_help():
2626
print_help(with_usage=False)
2727

2828

29-
equery.initialize_configuration()
30-
args = sys.argv[1:]
31-
if not args or {'-h', '--help'}.intersection(args):
32-
print_epkginfo_help()
33-
else:
34-
try:
35-
main(args)
36-
except AmbiguousPackageName as e:
37-
pkgs = e.args[0]
38-
for candidate in pkgs:
39-
print(candidate)
40-
41-
from gentoolkit import pprinter as pp
42-
from os.path import basename # To get the short name
43-
44-
print(file=sys.stderr)
45-
print(pp.error("The short ebuild name '%s' is ambiguous. Please specify" % basename(pkgs[0])),
46-
file=sys.stderr, end="")
47-
pp.die(1, "one of the above fully-qualified ebuild names instead.")
48-
except errors.GentoolkitException as err:
49-
from gentoolkit import pprinter as pp
50-
pp.die(1, str(err))
29+
if __name__ == "__main__":
30+
equery.initialize_configuration()
31+
args = sys.argv[1:]
32+
if not args or {'-h', '--help'}.intersection(args):
33+
print_epkginfo_help()
34+
else:
35+
try:
36+
main(args)
37+
except AmbiguousPackageName as e:
38+
pkgs = e.args[0]
39+
for candidate in pkgs:
40+
print(candidate)
41+
42+
from gentoolkit import pprinter as pp
43+
from os.path import basename # To get the short name
44+
45+
print(file=sys.stderr)
46+
print(pp.error("The short ebuild name '%s' is ambiguous. Please specify" % basename(pkgs[0])),
47+
file=sys.stderr, end="")
48+
pp.die(1, "one of the above fully-qualified ebuild names instead.")
49+
except errors.GentoolkitException as err:
50+
from gentoolkit import pprinter as pp
51+
pp.die(1, str(err))
5152

5253
# vim: set ts=4 sw=4 tw=79:

bin/equery

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,21 @@ def formatwarning(message, category, filename, llineno, line=None):
3737
return pp.warn(str(message))
3838

3939

40-
if '--debug' not in sys.argv and not bool(os.getenv('DEBUG', False)):
41-
warnings.formatwarning = formatwarning
42-
43-
try:
44-
equery.main(sys.argv)
45-
except errors.GentoolkitNonZeroExit as err:
46-
sys.exit(err.return_code)
47-
except errors.GentoolkitException as err:
48-
if '--debug' in sys.argv or bool(os.getenv('DEBUG', False)):
49-
raise
50-
else:
51-
from gentoolkit import pprinter as pp
52-
sys.stderr.write(pp.error(str(err)))
53-
if err.is_serious:
54-
print()
55-
print("Add '--debug' to global options for traceback.")
56-
sys.exit(1)
40+
if __name__ == "__main__":
41+
if '--debug' not in sys.argv and not bool(os.getenv('DEBUG', False)):
42+
warnings.formatwarning = formatwarning
43+
44+
try:
45+
equery.main(sys.argv)
46+
except errors.GentoolkitNonZeroExit as err:
47+
sys.exit(err.return_code)
48+
except errors.GentoolkitException as err:
49+
if '--debug' in sys.argv or bool(os.getenv('DEBUG', False)):
50+
raise
51+
else:
52+
from gentoolkit import pprinter as pp
53+
sys.stderr.write(pp.error(str(err)))
54+
if err.is_serious:
55+
print()
56+
print("Add '--debug' to global options for traceback.")
57+
sys.exit(1)

bin/merge-driver-ekeyword

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ import sys
88
from gentoolkit.merge_driver_ekeyword import merge_driver_ekeyword
99

1010

11-
sys.exit(merge_driver_ekeyword.main(sys.argv[1:]))
11+
if __name__ == "__main__":
12+
sys.exit(merge_driver_ekeyword.main(sys.argv[1:]))

bin/revdep-rebuild

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,16 @@ except KeyboardInterrupt:
3232
from gentoolkit import errors
3333
from gentoolkit.revdep_rebuild import rebuild
3434

35-
try:
36-
success = rebuild.main(rebuild.parse_options())
37-
sys.exit(success)
38-
except errors.GentoolkitException as err:
39-
if '--debug' in sys.argv:
40-
raise
41-
else:
42-
from gentoolkit import pprinter as pp
43-
sys.stderr.write(pp.error(str(err)))
44-
print()
45-
print("Add '--debug' to global options for traceback.")
46-
sys.exit(1)
35+
if __name__ == "__main__":
36+
try:
37+
success = rebuild.main(rebuild.parse_options())
38+
sys.exit(success)
39+
except errors.GentoolkitException as err:
40+
if '--debug' in sys.argv:
41+
raise
42+
else:
43+
from gentoolkit import pprinter as pp
44+
sys.stderr.write(pp.error(str(err)))
45+
print()
46+
print("Add '--debug' to global options for traceback.")
47+
sys.exit(1)

0 commit comments

Comments
 (0)