From 9b800ca29fa79cd184745a8cedd9dcfcfdf8ab85 Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Sun, 21 Nov 2010 21:15:24 -0800 Subject: [PATCH] redo-ifchange.py: don't forget to release jwack tokens on exit. This only really matters if it exited abnormally... but it still matters. --- redo-ifchange.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/redo-ifchange.py b/redo-ifchange.py index 75fcd75..6c7da99 100755 --- a/redo-ifchange.py +++ b/redo-ifchange.py @@ -1,6 +1,6 @@ #!/usr/bin/python import sys, os, errno -import vars, state, builder +import vars, state, builder, jwack from helpers import debug, err, mkdirp, unlink @@ -56,13 +56,16 @@ if not vars.TARGET: rv = 202 try: - want_build = [] - for t in sys.argv[1:]: - state.add_dep(vars.TARGET, 'm', t) - if should_build(t): - want_build.append(t) + try: + want_build = [] + for t in sys.argv[1:]: + state.add_dep(vars.TARGET, 'm', t) + if should_build(t): + want_build.append(t) - rv = builder.main(want_build, maybe_build) + rv = builder.main(want_build, maybe_build) + finally: + jwack.force_return_tokens() except KeyboardInterrupt: sys.exit(200) sys.exit(rv)