mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-11-27 06:59:49 +01:00
Code Activity

Fix traceback in 'git-obs pr dump' while printing a warning about invalid submodule path

Browse Source
This commit is contained in:
Daniel Mach
2025-10-02 13:10:58 +02:00
parent ef3c488d79
commit 6bad43ad7e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
osc/commands_git/pr_dump.py
View File

@@ -291,14 +291,15 @@ class PullRequestDumpCommand(osc.commandline_git.GitObsCommand):
all_submodules = sorted(set(base_submodules) | set(head_submodules)) all_submodules = sorted(set(base_submodules) | set(head_submodules))
for i in all_submodules: for i in all_submodules:
if base_submodules[i]: if i in base_submodules:
url = base_submodules[i].get("url","") url = base_submodules[i].get("url", "")
if not url.startswith("../../"): if not url.startswith("../../"):
print(f"Warning: incorrect path ({url}) in base submodule ({i})", file=sys.stderr) print(f"Warning: incorrect path '{url}' in base submodule '{i}'", file=sys.stderr)
else:
url = base_submodules[i].get("url","") if i in head_submodules:
if url.startswith("../../"): url = head_submodules[i].get("url", "")
print(f"Warning: incorrect path ({url}) in head submodule ({i})", file=sys.stderr) if not url.startswith("../../"):
print(f"Warning: incorrect path '{url}' in head submodule '{i}'", file=sys.stderr)
if i in base_submodules and i not in head_submodules: if i in base_submodules and i not in head_submodules:
submodule_diff["removed"][i] = base_submodules[i] submodule_diff["removed"][i] = base_submodules[i]