add support for multiple blocked and depends on tickets

Author: abbbi

bugzilla2gitlab/models.py

@@ -173,14 +173,16 @@ def create_description(self, fields):
  "Architecture", fields.get("rep_platform")
  )
 
+ deplist = ""
+ blocklist = ""
  if fields.get("dependson") is not None:
- self.description += markdown_table_row(
- "Depends On", "[{}]({})".format(fields.get("dependson"), link)
- )
+ for depends in fields.get("dependson"):
+ deplist += "[{}]({}) ".format(depends, link)
+ self.description += markdown_table_row("Depends On", deplist)
  if fields.get("blocked") is not None:
- self.description += markdown_table_row(
- "Blocked by", "[{}]({})".format(fields.get("blocked"), link)
- )
+ for blocked in fields.get("blocked"):
+ blocklist += "[{}]({}) ".format(blocked, link)
+ self.description += markdown_table_row("Blocked by", blocklist)
 
  # add first comment to the issue description
  attachments = []

bugzilla2gitlab/utils.py

@@ -81,11 +81,7 @@ def get_bugzilla_bug(bugzilla_url, bug_id):
  bug_xml = _fetch_bug_content(bugzilla_url, bug_id)
  tree = ElementTree.fromstring(bug_xml)
 
- bug_fields = {
- "long_desc": [],
- "attachment": [],
- "cc": [],
- }
+ bug_fields = {"long_desc": [], "attachment": [], "cc": [], "dependson": []}
  for bug in tree:
  for field in bug:
  if field.tag in ("long_desc", "attachment"):
@@ -95,6 +91,8 @@ def get_bugzilla_bug(bugzilla_url, bug_id):
  bug_fields[field.tag].append(new)
  elif field.tag == "cc":
  bug_fields[field.tag].append(field.text)
+ elif field.tag == "dependson":
+ bug_fields[field.tag].append(field.text)
  else:
  bug_fields[field.tag] = field.text