Skip to content

Commit

Permalink
Temporary fix for json decoding issue with double quote
Browse files Browse the repository at this point in the history
  • Loading branch information
barseghyanartur committed Nov 17, 2019
1 parent 74051e0 commit 93638c5
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions src/matyan/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,10 @@ def prepare_changelog(

# Now go through commits
for json_entry in filter(None, logs['LOG']):
entry = json.loads(json_entry)
try:
entry = json.loads(json_entry)
except json.decoder.JSONDecodeError:
continue # TODO: fix this
merge_commit = True if ' ' in entry['merge'] else False
if merge_commit:
match = re.match(REGEX_PATTERN_MERGED_BRANCH_NAME, entry['title'])
Expand Down Expand Up @@ -389,7 +392,11 @@ def prepare_releases_changelog(

# Now go through commits
for json_entry in filter(None, logs['LOG']):
entry = json.loads(json_entry)
try:
entry = json.loads(json_entry)
except json.decoder.JSONDecodeError:
continue # TODO: fix this

merge_commit = True if ' ' in entry['merge'] else False
if merge_commit:
match = re.match(REGEX_PATTERN_MERGED_BRANCH_NAME, entry['title'])
Expand Down

0 comments on commit 93638c5

Please sign in to comment.