public inbox for cygwin-apps-cvs@sourceware.org help / color / mirror / Atom feed
From: Jon Turney <jturney@sourceware.org> To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20230209-86-g6898782 Date: Wed, 10 Apr 2024 16:42:31 +0000 (GMT) [thread overview] Message-ID: <20240410164232.0AD2C3889809@sourceware.org> (raw) 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))
reply other threads:[~2024-04-10 16:42 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240410164232.0AD2C3889809@sourceware.org \ --to=jturney@sourceware.org \ --cc=cygwin-apps-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).