From 3f72623da17cb6fa28ef1837ea3f14650bd8773e Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Mon, 28 Aug 2023 00:58:11 +0200 Subject: [PATCH] Repair manglesrcname - correct undefined variable - use removeprefix instead of lstrip to avoid stripping other characters Signed-off-by: Georg Pfuetzenreuter --- opam2rpm.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/opam2rpm.py b/opam2rpm.py index b932392..8f8e0f8 100755 --- a/opam2rpm.py +++ b/opam2rpm.py @@ -116,8 +116,11 @@ def parse_dependencies(dependencies): return buildrequires def manglesrcname(name): - if name.startswith('ocaml-') and prefixed: # where is "prefixed" defined ? - return name.lstrip('ocaml-') + log.debug(f'Mangling srcname {name}') + if name.startswith('ocaml-') and not downstream_prefixed: + name = name.removeprefix('ocaml-') + log.debug(f'Rewriting srcname to {name}') + return name else: return name