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

[Jon TURNEY]

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

commit cff06d3dc719f5277ca9229d42153e5073a03f7e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Wed Aug 26 15:48:26 2020 +0100

    Further relax unique-version check for python modules

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

commit 0d4ddc942221483b40b65f9cb73ca4715049f075
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue Aug 25 17:41:40 2020 +0100

    Always discard packages which already exist in relarea
    
    Always discard packages which already exist in relarea, rather than
    keeping them around to warn about if they are different.


Diff:
---
 calm/package.py | 2 +-
 calm/uploads.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/calm/package.py b/calm/package.py
index 75f5f9f..d59586a 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -872,7 +872,7 @@ def validate_packages(args, packages):
 
             # ignore Python module packages, as we may keep old versions of
             # those
-            if re.match(r'^python[23][567]-.*', install_p):
+            if re.match(r'^python[23][5678]?-.*', install_p):
                 continue
 
             # ignore packages which don't have a current version (i.e. are test
diff --git a/calm/uploads.py b/calm/uploads.py
index 2f4bb87..6d20d58 100644
--- a/calm/uploads.py
+++ b/calm/uploads.py
@@ -267,7 +267,8 @@ def scan(m, all_packages, arch, args):
                         logging.info("discarding, identical %s is already in release area" % fn)
                         remove_success.append(fn)
                     else:
-                        logging.error("ignoring, different %s is already in release area (perhaps you should rebuild with a different version-release identifier?)" % fn)
+                        logging.error("discarding, different %s is already in release area (perhaps you should rebuild with a different version-release identifier?)" % fn)
+                        remove.append(fn)
                         error = True
                     files.remove(f)
                 else: