Commit 345954bf authored by Steve Borho's avatar Steve Borho
Browse files

status: catch util.Abort from subrepository status calls

Refs #1660

branch : stable
parent f334a0395129
......@@ -698,7 +698,9 @@ class GStatus(gdialog.GWindow):
for s in wctx.substate:
if matcher(s) and wctx.sub(s).dirty():
except (OSError, IOError, error.ConfigError, error.RepoError), e:
except (error.ConfigError, error.RepoError), e:
self.status_error = str(e)
except (OSError, IOError, util.Abort), e:
self.status_error = str(e)
def status_wait(thread):
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment