bugzilla: stop bugs always being marked as fixed in xmlrpc (issue3484) stable
authorJim Hague <jim.hague@acm.org>
Wed, 06 Jun 2012 16:44:17 +0100
branchstable
changeset 16876 fdc879042414
parent 16869 00e1e40d709c
child 16877 6e578e77cbe6
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.
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: