[PATCH stable] bugzilla: stop bugs always being marked as fixed in xmlrpc (issue3484)

[Jim Hague]

# HG changeset patch
# User Jim Hague <jim.hague at acm.org>
# Date 1338997457 -3600
# Branch stable
# Node ID fdc8790424142ab1292391b456a561c814102d46
# Parent  00e1e40d709c49d1a124c62c3376d91ce1de2197
bugzilla: stop bugs always being marked as fixed in xmlrpc (issue3484)

Bugs should only be marked fixed if the comment parser gives them the
fixed state. xmlrpc+email got this right, xmlrpc screwed it up.

diff -r 00e1e40d709c -r fdc879042414 hgext/bugzilla.py
--- a/hgext/bugzilla.py	Mon Jun 04 17:22:09 2012 -0500
+++ b/hgext/bugzilla.py	Wed Jun 06 16:44:17 2012 +0100
@@ -654,8 +654,9 @@
         if self.bzvermajor >= 4:
             args['ids'] = [bugid]
             args['comment'] = {'body' : text}
-            args['status'] = self.fixstatus
-            args['resolution'] = self.fixresolution
+            if 'fix' in newstate:
+                args['status'] = self.fixstatus
+                args['resolution'] = self.fixresolution
             self.bzproxy.Bug.update(args)
         else:
             if 'fix' in newstate: