Skip to content

Commit 98570dc

Browse files
authored
Merge pull request openSUSE#1948 from dmach/git-obs-pr-dump-fix-submodule-path-warning
Fix traceback in 'git-obs pr dump' while printing a warning about invalid submodule path
2 parents 4af579e + 6bad43a commit 98570dc

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

osc/commands_git/pr_dump.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -291,14 +291,15 @@ def run(self, args):
291291
all_submodules = sorted(set(base_submodules) | set(head_submodules))
292292
for i in all_submodules:
293293

294-
if base_submodules[i]:
295-
url = base_submodules[i].get("url","")
294+
if i in base_submodules:
295+
url = base_submodules[i].get("url", "")
296296
if not url.startswith("../../"):
297-
print(f"Warning: incorrect path ({url}) in base submodule ({i})", file=sys.stderr)
298-
else:
299-
url = base_submodules[i].get("url","")
300-
if url.startswith("../../"):
301-
print(f"Warning: incorrect path ({url}) in head submodule ({i})", file=sys.stderr)
297+
print(f"Warning: incorrect path '{url}' in base submodule '{i}'", file=sys.stderr)
298+
299+
if i in head_submodules:
300+
url = head_submodules[i].get("url", "")
301+
if not url.startswith("../../"):
302+
print(f"Warning: incorrect path '{url}' in head submodule '{i}'", file=sys.stderr)
302303

303304
if i in base_submodules and i not in head_submodules:
304305
submodule_diff["removed"][i] = base_submodules[i]

0 commit comments

Comments
 (0)