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

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

[Jon Turney]

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

commit 213a2d8f4584d336f12c6271792c4a01ed804899
Author: Jon Turney <jon.turney@dronecode.org.uk>
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 <jon.turney@dronecode.org.uk>
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))