# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1304674300 -7200
# Node ID 202ff575d49b81ed020de44cfa08cded3a92736f
# Parent  71d5287351e908552e8c339ef891c4848d54bb92
patch: fix clash between  local variable and exception instance

The local err variable would be bound to PatchError thrown and it
keeps this value even after the except block is executed.

The whole thing worked anyway since the rejected variable is set in
the except block and this makes the function return -1 when a
PatchError is thrown.

diff -r 71d5287351e9 -r 202ff575d49b mercurial/patch.py
--- a/mercurial/patch.py	Fri May 06 11:12:55 2011 +0200
+++ b/mercurial/patch.py	Fri May 06 11:31:40 2011 +0200
@@ -1132,8 +1132,8 @@
                                                    first_hunk, strip)
                 current_file = patcher(ui, current_file, opener,
                                        missing=missing, eolmode=eolmode)
-            except PatchError, err:
-                ui.warn(str(err) + '\n')
+            except PatchError, inst:
+                ui.warn(str(inst) + '\n')
                 current_file = None
                 rejects += 1
                 continue