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