Merge lp:~clay-gerrard/swift/st_help_hangs into lp:~hudson-openstack/swift/trunk

Proposed by clayg on 2011-02-05
Status: Merged
Approved by: Jay Payne on 2011-02-08
Approved revision: 210
Merged at revision: 210
Proposed branch: lp:~clay-gerrard/swift/st_help_hangs
Merge into: lp:~hudson-openstack/swift/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
bin/st (+1/-1)
To merge this branch: bzr merge lp:~clay-gerrard/swift/st_help_hangs
Reviewer Review Type Date Requested Status
Jay Payne (community) 2011-02-05 Approve on 2011-02-08
Review via email: mp+48688@code.launchpad.net

Commit message

fix st <command> --help hangs

Description of the change

fix st <command> --help hangs

To post a comment you must log in.
Jay Payne (letterj) wrote :

Looks good. I tested help with all the commands and ran through some general st testing

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/st'
2--- bin/st 2011-01-26 22:38:13 +0000
3+++ bin/st 2011-02-05 03:06:13 +0000
4@@ -1723,7 +1723,7 @@
5 error_thread.abort = True
6 while error_thread.isAlive():
7 error_thread.join(0.01)
8- except Exception:
9+ except (SystemExit, Exception):
10 for thread in threading_enumerate():
11 thread.abort = True
12 raise