[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20200611-10-g7e1c390

[Jon TURNEY <jturney@sourceware.org>]

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

commit 7e1c3909ebe425b9dcdb40f0c2f3a0356aa384f3
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue Jul 28 15:56:49 2020 +0100

    Remove yselkowitz from always Bcc and error email lists

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

commit 0f5b4cc8a67bf5d37459318e954402de2ddd1142
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue Jul 28 15:55:57 2020 +0100

    Don't use full paths for 'not on package list' upload errors

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

commit 0aad95e50647e0aa61622a85a9403e395eb84d30
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Thu Jul 23 19:03:10 2020 +0100

    Tweak debug message added in e7906497

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

commit c7a214c274e6197f6a98e5bec243b31d3403aabb
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Jul 19 17:53:08 2020 +0100

    Raise minimum setup version to 2.895
    
    provides: isn't supported by setup earlier than 2.891, so we can't
    install anything which requires: something that is provides:ed with that
    version.


Diff:
---
 calm/common_constants.py                      | 4 ++--
 calm/package.py                               | 4 ++--
 calm/uploads.py                               | 4 ++--
 test/testdata/inifile/setup.ini.expected      | 2 +-
 test/testdata/process_arch/setup.ini.expected | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/calm/common_constants.py b/calm/common_constants.py
index 7111dd6..fe3fcfa 100644
--- a/calm/common_constants.py
+++ b/calm/common_constants.py
@@ -36,10 +36,10 @@ HOMEDIR = '/sourceware/cygwin-staging/home'
 FTP = '/var/ftp/pub/cygwin'
 
 # logs are emailed to these addresses if any errors occurred
-EMAILS = ','.join(list(map(lambda m: m + '@sourceware.org', ['corinna', 'yselkowitz'])) + ['Stromeko@NexGo.DE'])
+EMAILS = ','.join(list(map(lambda m: m[0] + '@' + m[1], zip(['corinna', 'Stromeko'], ['sourceware.org', 'NexGo.DE']))))
 
 # every email we send is bcc'd to these addresses
-ALWAYS_BCC = 'jturney@sourceware.org, yselkowitz@sourceware.org'
+ALWAYS_BCC = 'jturney@sourceware.org'
 
 # these maintainers can upload orphaned packages as well
 #
diff --git a/calm/package.py b/calm/package.py
index 2d115c2..75f5f9f 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -988,7 +988,7 @@ def write_setup_ini(args, packages, arch):
             print("include-setup: setup <2.878 not supported", file=f)
 
             # not implemented until 2.890, ignored by earlier versions
-            print("setup-minimum-version: 2.891", file=f)
+            print("setup-minimum-version: 2.895", file=f)
 
             # for setup to check if a setup upgrade is possible
             print("setup-version: %s" % args.setup_version, file=f)
@@ -1317,7 +1317,7 @@ def delete(packages, path, fn):
 
     # (modify package set outside of iteration over it)
     for p in ex_packages:
-        logging.info("removing package '%s' for package set" % (p))
+        logging.debug("removing package '%s' from package set" % (p))
         del packages[p]
 
 
diff --git a/calm/uploads.py b/calm/uploads.py
index 06a8472..388e089 100644
--- a/calm/uploads.py
+++ b/calm/uploads.py
@@ -138,12 +138,12 @@ def scan(m, all_packages, arch, args):
         # package doesn't appear in package list at all
         (_, _, pkgpath) = relpath.split(os.sep, 2)
         if not package.is_in_package_list(pkgpath, all_packages):
-            logging.error("package '%s' is not in the package list" % dirpath)
+            logging.error("package '%s' is not in the package list" % relpath)
             continue
 
         # only process packages for which we are listed as a maintainer
         if not package.is_in_package_list(pkgpath, m.pkgs):
-            logging.warning("package '%s' is not in the package list for maintainer %s" % (dirpath, m.name))
+            logging.warning("package '%s' is not in the package list for maintainer %s" % (relpath, m.name))
             continue
 
         # see if we can fix-up any setup.hint files
diff --git a/test/testdata/inifile/setup.ini.expected b/test/testdata/inifile/setup.ini.expected
index bfb82f7..ff9dc85 100644
--- a/test/testdata/inifile/setup.ini.expected
+++ b/test/testdata/inifile/setup.ini.expected
@@ -9,7 +9,7 @@
  'arch: x86\n'
  'setup-timestamp: 1458221800\n'
  'include-setup: setup <2.878 not supported\n'
- 'setup-minimum-version: 2.891\n'
+ 'setup-minimum-version: 2.895\n'
  'setup-version: 4.321\n'
  '\n'
  '@ arc\n'
diff --git a/test/testdata/process_arch/setup.ini.expected b/test/testdata/process_arch/setup.ini.expected
index 26378a3..e7aa93c 100644
--- a/test/testdata/process_arch/setup.ini.expected
+++ b/test/testdata/process_arch/setup.ini.expected
@@ -9,7 +9,7 @@
  'arch: x86\n'
  'setup-timestamp: 1473797080\n'
  'include-setup: setup <2.878 not supported\n'
- 'setup-minimum-version: 2.891\n'
+ 'setup-minimum-version: 2.895\n'
  'setup-version: 3.1415\n'
  '\n'
  '@ arc\n'