Patchwork D7463: wireprotov1server: capture Abort type before accessing the `hint` attribute

login
register
mail settings
Submitter phabricator
Date Nov. 21, 2019, 1:35 p.m.
Message ID <14d5eb0f8d8c30163288b35469659cf0@localhost.localdomain>
Download mbox | patch
Permalink /patch/43382/
State Not Applicable
Headers show

Comments

phabricator - Nov. 21, 2019, 1:35 p.m.
Closed by commit rHG1d1232c0726f: wireprotov1server: capture Abort type before accessing the `hint` attribute (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7463?vs=18253&id=18259

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7463/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7463

AFFECTED FILES
  mercurial/wireprotov1server.py

CHANGE DETAILS




To: mharbison72, #hg-reviewers, dlax, pulkit
Cc: mercurial-devel

Patch

diff --git a/mercurial/wireprotov1server.py b/mercurial/wireprotov1server.py
--- a/mercurial/wireprotov1server.py
+++ b/mercurial/wireprotov1server.py
@@ -679,7 +679,7 @@ 
             if not getattr(exc, 'duringunbundle2', False):
                 try:
                     raise
-                except error.Abort:
+                except error.Abort as exc:
                     # The old code we moved used procutil.stderr directly.
                     # We did not change it to minimise code change.
                     # This need to be moved to something proper.