[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20230209-86-g6898782

[Jon Turney]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=68987828c59521bb8bf632e80b38101144ca3b32

commit 68987828c59521bb8bf632e80b38101144ca3b32
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue Apr 9 23:35:06 2024 +0100

    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.


Diff:
---
 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 validate_packages(args, packages, valid_provides_extra=None, missing_obsolet
 
                         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))