From 8869a2d3df7cef2e87d1bb63d0e4740b7ba8b153 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Mon, 16 Mar 2026 06:02:48 +0100
Subject: [PATCH] cmds.projects.BaseCmdPkgRelations: Code beautification

pkg_relations_list() has an intricate case distinction around
expand_semver_revision_range, clean that up.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 .../pkg/cmds/projects/BaseCmdPkgRelations.py  | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/python/jw/pkg/cmds/projects/BaseCmdPkgRelations.py b/src/python/jw/pkg/cmds/projects/BaseCmdPkgRelations.py
index d92a75ab..ab6ae5a9 100644
--- a/src/python/jw/pkg/cmds/projects/BaseCmdPkgRelations.py
+++ b/src/python/jw/pkg/cmds/projects/BaseCmdPkgRelations.py
@@ -100,28 +100,27 @@ class BaseCmdPkgRelations(Cmd):
                                     pass
                                 else:
                                     raise Exception("Unknown version specifier in " + spec)
-                        if not expand_semver_revision_range:
+                        if len(dep) != 3 or not expand_semver_revision_range:
                             expanded_deps = [dep]
                         else:
                             expanded_deps = []
-                            if expand_semver_revision_range and len(dep) == 3:
-                                semver = re.split(r'[.-]', version)
-                                if len(semver) != 4:
-                                    expanded_deps = [dep]
-                                else:
-                                    release = int(semver[2])
-                                    major_minor = f'{semver[0]}.{semver[1]}'
-                                    match dep[1]:
-                                        case '>' | '>=':
-                                            expanded_deps.append([dep[0], dep[1], dep[2]])
-                                            expanded_deps.append([dep[0], '<', f'{major_minor}.{release + 1}'])
-                                        case '<' | '<=':
-                                            expanded_deps.append([dep[0], dep[1], dep[2]])
-                                        case '=':
-                                            expanded_deps.append([dep[0], '>=', f'{major_minor}.{release}'])
-                                            expanded_deps.append([dep[0], '<', f'{major_minor}.{release + 1}'])
-                                        case _:
-                                            raise NotImplementedError(f'Expanding SemVer range "{dep[0]} {dep[1]} {dep[3]}" is not yet implemented')
+                            semver = re.split(r'[.-]', version)
+                            if len(semver) != 4:
+                                expanded_deps = [dep]
+                            else:
+                                release = int(semver[2])
+                                major_minor = f'{semver[0]}.{semver[1]}'
+                                match dep[1]:
+                                    case '>' | '>=':
+                                        expanded_deps.append([dep[0], dep[1], dep[2]])
+                                        expanded_deps.append([dep[0], '<', f'{major_minor}.{release + 1}'])
+                                    case '<' | '<=':
+                                        expanded_deps.append([dep[0], dep[1], dep[2]])
+                                    case '=':
+                                        expanded_deps.append([dep[0], '>=', f'{major_minor}.{release}'])
+                                        expanded_deps.append([dep[0], '<', f'{major_minor}.{release + 1}'])
+                                    case _:
+                                        raise NotImplementedError(f'Expanding SemVer range "{dep[0]} {dep[1]} {dep[3]}" is not yet implemented')
                         for expanded_dep in expanded_deps:
                             if hide_self and dep_name in modules:
                                 continue