Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • seco-ne/yocto/infrastructure/gitlab-ci
1 result
Show changes
Commits on Source (5)
......@@ -99,6 +99,7 @@ def wait_until_merge_status_is_set(project: Project, mr: MergeRequest):
"""Periodically query MR until GitLab has checked its merge status"""
print("Waiting until merge status has been checked", end="", flush=True)
unchecked_states = ["unchecked", "checking", "cannot_be_merged_recheck"]
mr = project.mergerequests.get(mr.iid, retry_transient_errors=True)
while mr.merge_status in unchecked_states:
print(".", end="", flush=True)
time.sleep(1)
......
......@@ -12,7 +12,7 @@ import alphaplan_fwr
def md5(fname):
hash_md5 = hashlib.md5()
with open(fname, "rb", encoding="utf-8") as f:
with open(fname, "rb", encoding=None) as f:
for chunk in iter(lambda: f.read(4096), b""):
hash_md5.update(chunk)
return hash_md5.hexdigest()
......