From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 0AD2C3889809; Wed, 10 Apr 2024 16:42:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0AD2C3889809 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1712767352; bh=wELNafDgi53BiVDuHayf7eZ85Ozw1ycJSrXE0JAjR3U=; h=To:Subject:Date:From:From; b=XJ/ZxKzmVFm98wj6mqCGNSPrgaDtAY7dnMd9eQnBQGh3y4ad11V6ka9LdZ+cUQyOE DkD43BjaMVy+D/1bnMgVSnpRGI1N/nJ8J8UyOs9TfdPK9p4ir7oFpL8J015AaAYucw OFWdL7/3gN2mEEaetyF1r6EfprXZOd5mSEalxV1k= To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20230209-86-g6898782 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 13248b3a30eee83bc91bd0d27e03593a77859e2b X-Git-Newrev: 68987828c59521bb8bf632e80b38101144ca3b32 Message-Id: <20240410164232.0AD2C3889809@sourceware.org> Date: Wed, 10 Apr 2024 16:42:31 +0000 (GMT) From: Jon Turney List-Id: https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=68987828c59521bb8bf632e80b38101144ca3b32 commit 68987828c59521bb8bf632e80b38101144ca3b32 Author: Jon Turney 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))