From 5c04967ddf34267e6444e2fc1f3701d233fb8773 Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Wed, 12 Mar 2014 17:11:18 +0800
Subject: [PATCH] Missing arguments when getting issue details from tracker

---
 lib/jira.py   | 15 +++++++++++----
 lib/moodle.py |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/jira.py b/lib/jira.py
index faf25fd..051c520 100644
--- a/lib/jira.py
+++ b/lib/jira.py
@@ -103,7 +103,7 @@ class Jira(object):
         """
 
         querystring = {'fields': fields, 'expand': 'names'}
-        resp = self.request('issue/%s' % (str(key)), data=urlencode(querystring))
+        resp = self.request('issue/%s' % (str(key)), params=querystring)
 
         if resp['status'] == 404:
             raise JiraException('Issue could not be found.')
@@ -260,11 +260,18 @@ class Jira(object):
         for updatename, updatevalue in updates.items():
             remotevalue = issue.get('named').get(updatename)
             if not remotevalue or remotevalue != updatevalue:
-                fieldkey = [k for k, v in issue.get('names').iteritems() if v == updatename][0]
-                update['fields'][fieldkey] = updatevalue
+                # Map the label of the field with the field code.
+                fieldKey = None
+                for k, v in issue.get('names').iteritems():
+                    if v == updatename:
+                        fieldKey = k
+                        break
+                if not fieldKey:
+                    raise JiraException('Could not find the field named \'%s\'' % (updatename))
+                update['fields'][fieldKey] = updatevalue
 
         if not update['fields']:
-            # No fields to update
+            # No fields to update.
             logging.info('No updates required')
             return True
 
diff --git a/lib/moodle.py b/lib/moodle.py
index 4ba9948..abbc510 100644
--- a/lib/moodle.py
+++ b/lib/moodle.py
@@ -764,7 +764,7 @@ class Moodle(object):
         fieldbranch = C.get('tracker.fieldnames.%s.branch' % version)
         fielddiffurl = C.get('tracker.fieldnames.%s.diffurl' % version)
 
-        if not (fieldrepositoryurl or fieldbranch or fielddiffurl):
+        if not fieldrepositoryurl or not fieldbranch or not fielddiffurl:
             logging.error('Cannot set tracker fields for this version (%s). The field names are not set in the config file.', version)
         else:
             logging.info('Setting tracker fields: \n  %s: %s \n  %s: %s \n  %s: %s' %
-- 
2.11.0