projects
/
cdist.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e73f084
)
Try to use finally better to terminate subprocesses when we die.
author
Carl Hetherington
<cth@carlh.net>
Mon, 14 Feb 2022 12:38:43 +0000
(13:38 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 14 Feb 2022 12:38:43 +0000
(13:38 +0100)
cdist
patch
|
blob
|
history
diff --git
a/cdist
b/cdist
index 21a9ab594572f8d234000e13502a1be095f275c4..543f1d71e2b27f124b3aa3861e2ad9cb57ebfa50 100755
(executable)
--- a/
cdist
+++ b/
cdist
@@
-1,6
+1,6
@@
#!/usr/bin/python3
#!/usr/bin/python3
-# Copyright (C) 2012-202
1
Carl Hetherington <cth@carlh.net>
+# Copyright (C) 2012-202
2
Carl Hetherington <cth@carlh.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-1239,10
+1239,12
@@
def main():
if args.target is None:
raise Error('you must specify -t or --target')
if args.target is None:
raise Error('you must specify -t or --target')
- target = target_factory(args)
- target.build(args.project, args.checkout, get_command_line_options(args))
- if not args.keep:
- target.cleanup()
+ try:
+ target = target_factory(args)
+ target.build(args.project, args.checkout, get_command_line_options(args))
+ finally:
+ if not args.keep:
+ target.cleanup()
elif args.command == 'package':
if args.target is None:
elif args.command == 'package':
if args.target is None:
@@
-1262,10
+1264,9
@@
def main():
makedirs(output_dir)
target.package(args.project, args.checkout, output_dir, get_command_line_options(args), not args.no_notarize)
makedirs(output_dir)
target.package(args.project, args.checkout, output_dir, get_command_line_options(args), not args.no_notarize)
-
except Error as e
:
+
finally
:
if target is not None and not args.keep:
target.cleanup()
if target is not None and not args.keep:
target.cleanup()
- raise
if target is not None and not args.keep:
target.cleanup()
if target is not None and not args.keep:
target.cleanup()