Skip to content
Snippets Groups Projects

Add the missing type specifier

Merged Ritesh Raj Sarraf requested to merge wip/ritesh/add-the-missing-f into apertis/v2022dev2
1 file
+ 1
1
Compare changes
  • Side-by-side
  • Inline
@@ -94,7 +94,7 @@ def main():
print("New target, doing merge")
proposed_branch = f"proposed-updates/{upstream_branch}/{ref[0:8]}"
git.checkout("-B", proposed_branch)
apertis_pkg_merge_updates(f"--downstream={downstream_branch}", f"--upstream={upstream_branch}", "--local-version-suffix={local_suffix}", _fg=True)
apertis_pkg_merge_updates(f"--downstream={downstream_branch}", f"--upstream={upstream_branch}", f"--local-version-suffix={local_suffix}", _fg=True)
o = git('diff', '--quiet', f"HEAD..{downstream_branch}", _ok_code=[0,1])
if o.exit_code == 1:
print("Merge done, pushing")
Loading