From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id C68F93858D39; Fri, 20 Oct 2023 16:51:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C68F93858D39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1697820711; bh=m8rEPjdOSFOy4JWppt7oFPkM591VW3bbgMY1RaiKQjs=; h=To:Subject:Date:From:From; b=gAGEC6DqRpEAxrZL9NzLffNQX5PYOdNJ4e2kxDMoh7JaG2HPfFHYUeBfsB+D5ifqh JY+MFM5SL7PxlYWwi23YeCWv003yi5+TL1D2Xtnww8NzIQKVMeRjRKIT6YL+kKcCo1 XXTYGKTKeFQFQLsY5IK70zjhlqtvjJXVYYQ8tUkM= To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20230209-46-g213a2d8 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: cda9f0512545bf5374cbed851e58140537a38f39 X-Git-Newrev: 213a2d8f4584d336f12c6271792c4a01ed804899 Message-Id: <20231020165151.C68F93858D39@sourceware.org> Date: Fri, 20 Oct 2023 16:51:51 +0000 (GMT) From: Jon Turney List-Id: https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=213a2d8f4584d336f12c6271792c4a01ed804899 commit 213a2d8f4584d336f12c6271792c4a01ed804899 Author: Jon Turney Date: Fri Oct 20 17:37:09 2023 +0100 Use source package of actual version, not best version in vaulting Use the source package of the actual version being considered, not the best version, when determining if a package is owned by a source package to be vaulted. (Source package can change between versions, if sources are split or merged) https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=4ec27f5a72a43faef3aabb782b894fd2d4f95f85 commit 4ec27f5a72a43faef3aabb782b894fd2d4f95f85 Author: Jon Turney Date: Fri Oct 20 17:35:34 2023 +0100 Downgrade a piece of debug logging Diff: --- calm/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calm/package.py b/calm/package.py index e45874c..a9aff3d 100755 --- a/calm/package.py +++ b/calm/package.py @@ -1570,7 +1570,7 @@ def mark_fn(packages, po, v, certain_age, vault_requests): requires = po.version_hints[v].get('depends', '').split(', ') if re.match(r'^python(|2|27)-', pn): if any(ep in requires for ep in past_mistakes.expired_provides) or po.obsolete: - logging.info("package '%s' version '%s' not retained as it requires a provide known to be expired" % (pn, v)) + logging.debug("package '%s' version '%s' not retained as it requires a provide known to be expired" % (pn, v)) return Freshness.conditional # - explicitly marked as 'noretain' @@ -1582,7 +1582,7 @@ def mark_fn(packages, po, v, certain_age, vault_requests): # - marked via 'calm-tool vault' # - es = po.srcpackage(bv, suffix=False) + es = po.srcpackage(v, suffix=False) if es in vault_requests: if v in vault_requests[es]: logging.info("package '%s' version '%s' not retained due vault request" % (pn, v))