From 57f204ccaa06e282236aec818551b972d899df7f Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 15 Mar 2026 12:25:11 +0100 Subject: [PATCH] cmds.projects.BaseCmdPkgRelations: Remove --no-version Merge --no-version into the --syntax option as "--syntax names-only" to remove redundancy. Signed-off-by: Jan Lindemann --- make/topdir.mk | 2 +- src/python/jw/pkg/cmds/projects/BaseCmdPkgRelations.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/make/topdir.mk b/make/topdir.mk index e6c1f8bb..cb2a01ef 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -42,7 +42,7 @@ REMOTE_GIT_URL = ssh://$(JANWARE_USER_PREFIX)git.janware.com$(REMO ifneq ($(DONT_CHECK_PREREQ_DONE),true) ifndef PREREQ - PREREQ := $(call proj_query,pkg-requires --no-version --no-subpackages --subsections=jw --delimiter=' ' build $(PROJECT)) + PREREQ := $(call proj_query,pkg-requires --no-subpackages --subsections=jw --syntax names-only --delimiter=' ' build $(PROJECT)) endif ifndef PREREQ_DIRS PREREQ_DIRS := $(call proj_query,proj-dir $(PREREQ)) diff --git a/src/python/jw/pkg/cmds/projects/BaseCmdPkgRelations.py b/src/python/jw/pkg/cmds/projects/BaseCmdPkgRelations.py index f8022824..96a196af 100644 --- a/src/python/jw/pkg/cmds/projects/BaseCmdPkgRelations.py +++ b/src/python/jw/pkg/cmds/projects/BaseCmdPkgRelations.py @@ -42,7 +42,7 @@ class BaseCmdPkgRelations(Cmd): deps = value.split(',') for spec in deps: dep = re.split('([=><]+)', spec) - if args.no_version: + if args.syntax == 'names-only': dep = dep[:1] dep = list(map(str.strip, dep)) dep_name = re.sub('-dev$|-devel$|-run$', '', dep[0]) @@ -127,13 +127,11 @@ class BaseCmdPkgRelations(Cmd): parser.add_argument('module', nargs='*', help='Modules') parser.add_argument('-p', '--no-subpackages', action='store_true', default=False, help='Cut -run and -devel from package names') - parser.add_argument('--no-version', action='store_true', - default=False, help='Don\'t report version information') parser.add_argument('--dont-strip-revision', action='store_true', default=False, help='Always treat VERSION macro as VERSION-REVISION') parser.add_argument('--expand-semver-revision-range', action='store_true', default=False, help='Always treat =VERSION macro as >= VERSION-0 and < (VERSION+1)-0') - parser.add_argument('--syntax', choices=['semver', 'debian'], + parser.add_argument('--syntax', choices=['semver', 'debian', 'names-only'], default='semver', help='Output syntax') parser.add_argument('--recursive', action='store_true', default=False, help='Find dependencies recursively')