Skip to content

Commit 02f05a6

Browse files
committed
bin: only set signal handlers for main
Similar to d7d6fd54f1c936e89c5e4467c6c1f33b217325ca in portage.git. Bug: https://bugs.gentoo.org/941956 Bug: https://bugs.gentoo.org/967199 Signed-off-by: Sam James <sam@gentoo.org>
1 parent 2896c47 commit 02f05a6

File tree

8 files changed

+32
-34
lines changed

8 files changed

+32
-34
lines changed

bin/eclean

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ try:
2525
signal.signal(signal.SIGTERM, signal.SIG_IGN)
2626
print()
2727
sys.exit(1)
28-
29-
signal.signal(signal.SIGINT, exithandler)
30-
signal.signal(signal.SIGTERM, exithandler)
31-
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
32-
3328
except KeyboardInterrupt:
3429
print()
3530
sys.exit(1)
@@ -38,6 +33,10 @@ except KeyboardInterrupt:
3833
from gentoolkit.eclean.cli import main
3934

4035
if __name__ == "__main__":
36+
signal.signal(signal.SIGINT, exithandler)
37+
signal.signal(signal.SIGTERM, exithandler)
38+
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
39+
4140
try:
4241
main()
4342
except KeyboardInterrupt:

bin/eclean-dist

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ try:
2626
print()
2727
sys.exit(1)
2828

29-
signal.signal(signal.SIGINT, exithandler)
30-
signal.signal(signal.SIGTERM, exithandler)
31-
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
32-
3329
except KeyboardInterrupt:
3430
print()
3531
sys.exit(1)
@@ -38,6 +34,10 @@ except KeyboardInterrupt:
3834
from gentoolkit.eclean.cli import main
3935

4036
if __name__ == "__main__":
37+
signal.signal(signal.SIGINT, exithandler)
38+
signal.signal(signal.SIGTERM, exithandler)
39+
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
40+
4141
try:
4242
main()
4343
except KeyboardInterrupt:

bin/eclean-pkg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ try:
2626
print()
2727
sys.exit(1)
2828

29-
signal.signal(signal.SIGINT, exithandler)
30-
signal.signal(signal.SIGTERM, exithandler)
31-
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
32-
3329
except KeyboardInterrupt:
3430
print()
3531
sys.exit(1)
@@ -38,6 +34,10 @@ except KeyboardInterrupt:
3834
from gentoolkit.eclean.cli import main
3935

4036
if __name__ == "__main__":
37+
signal.signal(signal.SIGINT, exithandler)
38+
signal.signal(signal.SIGTERM, exithandler)
39+
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
40+
4141
try:
4242
main()
4343
except KeyboardInterrupt:

bin/ekeyword

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ try:
2323
print()
2424
sys.exit(1)
2525

26-
signal.signal(signal.SIGINT, exithandler)
27-
signal.signal(signal.SIGTERM, exithandler)
28-
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
29-
3026
except KeyboardInterrupt:
3127
print()
3228
sys.exit(1)
3329

3430
from gentoolkit.ekeyword import ekeyword
3531

3632
if __name__ == "__main__":
33+
signal.signal(signal.SIGINT, exithandler)
34+
signal.signal(signal.SIGTERM, exithandler)
35+
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
36+
3737
try:
3838
ekeyword.main(sys.argv[1:])
3939
except KeyboardInterrupt:

bin/enalyze

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ try:
2121
print()
2222
sys.exit(1)
2323

24-
signal.signal(signal.SIGINT, exithandler)
25-
signal.signal(signal.SIGTERM, exithandler)
26-
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
27-
2824
except KeyboardInterrupt:
2925
print()
3026
sys.exit(1)
3127

3228
from gentoolkit import enalyze, errors
3329

3430
if __name__ == "__main__":
31+
signal.signal(signal.SIGINT, exithandler)
32+
signal.signal(signal.SIGTERM, exithandler)
33+
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
34+
3535
try:
3636
enalyze.main()
3737
except errors.GentoolkitException as err:

bin/equery

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ try:
2020
print()
2121
sys.exit(1)
2222

23-
signal.signal(signal.SIGINT, exithandler)
24-
signal.signal(signal.SIGTERM, exithandler)
25-
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
26-
2723
except KeyboardInterrupt:
2824
print()
2925
sys.exit(1)
@@ -38,6 +34,10 @@ def formatwarning(message, category, filename, llineno, line=None):
3834

3935

4036
if __name__ == "__main__":
37+
signal.signal(signal.SIGINT, exithandler)
38+
signal.signal(signal.SIGTERM, exithandler)
39+
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
40+
4141
if '--debug' not in sys.argv and not bool(os.getenv('DEBUG', False)):
4242
warnings.formatwarning = formatwarning
4343

bin/imlate

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ try:
2323
print()
2424
sys.exit(1)
2525

26-
signal.signal(signal.SIGINT, exithandler)
27-
signal.signal(signal.SIGTERM, exithandler)
28-
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
29-
3026
except KeyboardInterrupt:
3127
print()
3228
sys.exit(1)
3329

3430
from gentoolkit.imlate import imlate
3531

3632
try:
33+
signal.signal(signal.SIGINT, exithandler)
34+
signal.signal(signal.SIGTERM, exithandler)
35+
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
36+
3737
imlate.main()
3838
except KeyboardInterrupt:
3939
print("Aborted.")

bin/revdep-rebuild

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ try:
2020
print()
2121
sys.exit(1)
2222

23-
signal.signal(signal.SIGINT, exithandler)
24-
signal.signal(signal.SIGTERM, exithandler)
25-
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
26-
27-
2823
except KeyboardInterrupt:
2924
print()
3025
sys.exit(1)
@@ -33,6 +28,10 @@ from gentoolkit import errors
3328
from gentoolkit.revdep_rebuild import rebuild
3429

3530
if __name__ == "__main__":
31+
signal.signal(signal.SIGINT, exithandler)
32+
signal.signal(signal.SIGTERM, exithandler)
33+
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
34+
3635
try:
3736
success = rebuild.main(rebuild.parse_options())
3837
sys.exit(success)

0 commit comments

Comments
 (0)