CVS commit: pkgsrc/pkgtools/python-versions-check

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jul  3 20:58:48 UTC 2023

Modified Files:
        pkgsrc/pkgtools/python-versions-check: Makefile
        pkgsrc/pkgtools/python-versions-check/files: python-versions-check

Log Message:
python-versions-check: update to 1.4.

Somenow not all of my intended changes this afternoon
made it into the commit.

Use issuperset() in more places, fix some messages.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/pkgtools/python-versions-check/Makefile
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/pkgtools/python-versions-check/files/python-versions-check

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/python-versions-check/Makefile
diff -u pkgsrc/pkgtools/python-versions-check/Makefile:1.4 pkgsrc/pkgtools/python-versions-check/Makefile:1.5
--- pkgsrc/pkgtools/python-versions-check/Makefile:1.4  Mon Jul  3 17:40:11 2023
+++ pkgsrc/pkgtools/python-versions-check/Makefile      Mon Jul  3 20:58:48 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2023/07/03 17:40:11 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2023/07/03 20:58:48 wiz Exp $
 
-PKGNAME=               python-versions-check-1.3
+PKGNAME=               python-versions-check-1.4
 CATEGORIES=            pkgtools
 
 MAINTAINER=            wiz%NetBSD.org@localhost

Index: pkgsrc/pkgtools/python-versions-check/files/python-versions-check
diff -u pkgsrc/pkgtools/python-versions-check/files/python-versions-check:1.4 pkgsrc/pkgtools/python-versions-check/files/python-versions-check:1.5
--- pkgsrc/pkgtools/python-versions-check/files/python-versions-check:1.4       Mon Jul  3 17:40:11 2023
+++ pkgsrc/pkgtools/python-versions-check/files/python-versions-check   Mon Jul  3 20:58:48 2023
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# $NetBSD: python-versions-check,v 1.4 2023/07/03 17:40:11 wiz Exp $
+# $NetBSD: python-versions-check,v 1.5 2023/07/03 20:58:48 wiz Exp $
 #
 # Copyright (c) 2023 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -213,7 +213,7 @@ for entry in result:
     if args.debug:
         print(f"DEBUG: comparing to {entry} - supports {entry_versions}")
     if not entry_versions.issuperset(supported_versions(args.package)):
-        report_problem(entry, entry_versions, entry_versions, supported_versions(args.package))
+        report_problem(entry, entry_versions, supported_versions(args.package), entry_versions)
 
 makefiles = glob.glob(args.pkgsrcdir + '/*/*/Makefile*')
 makefiles.extend(glob.glob(args.pkgsrcdir + '/*/*/*.mk'))
@@ -243,7 +243,7 @@ while searchlist:
     for package, dependencies in includes.items():
         if entry in dependencies:
             package_versions = supported_versions(package)
-            if entry_versions < package_versions:
-                report_problem(package, package_versions, package_versions, entry_versions)
+            if not entry_versions.issuperset(package_versions):
+                report_problem(package, package_versions, entry_versions. package_versions)
                 python_versions[package] = entry_versions
                 searchlist.add(package)