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 --git a/calm/package.py b/calm/package.py
index 5414053257c2b4209e8c134bab6587e206cbf6d5..efc01c4b8defa76566a7de04f340649f4fb08fdf 100755 (executable)
--- 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))