From 68987828c59521bb8bf632e80b38101144ca3b32 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Tue, 9 Apr 2024 23:35:06 +0100 Subject: [PATCH] Fix a bug in 'remove obsoleting package from depends of package it obsoletes' Fix a bug in 'remove obsoleting package from depends of package it obsoletes' code. This wasn't applying correctly if the dependency wasn't the first one, and left extraneous whitespace when it was. --- calm/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calm/package.py b/calm/package.py index 5414053..efc01c4 100755 --- a/calm/package.py +++ b/calm/package.py @@ -802,10 +802,10 @@ def add_needed_obsoletes(needed): for (ov, ohints) in packages[o].version_hints.items(): if 'depends' in ohints: - depends = ohints['depends'].split(',') + depends = ohints['depends'].split(', ') if p in depends: depends = [d for d in depends if d != p] - packages[o].version_hints[ov]['depends'] = ','.join(depends) + packages[o].version_hints[ov]['depends'] = ', '.join(depends) logging.debug("removed obsoleting '%s' from the depends: of package '%s'" % (p, o)) else: logging.debug("can't ensure package '%s' doesn't depends: on obsoleting '%s'" % (o, p))