[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20250329-37-g73ac9d6

[Jon Turney via Cygwin-apps-cvs]

Diff:
---
 calm/db.py            |  2 +-
 calm/package.py       |  2 +-
 calm/past_mistakes.py | 16 +++++++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/calm/db.py b/calm/db.py
index a6b19f5..5adbb76 100644
--- a/calm/db.py
+++ b/calm/db.py
@@ -65,7 +65,7 @@ def connect(args):
     cursor = conn.execute("SELECT * FROM vault_requests LIMIT 1")
     cols = [row[0] for row in cursor.description]
     if 'request_by' not in cols:
-        cursor.execute("ALTER TABLE vault_requests ADD COLUMN request_by TEXT 
NOT NULL")
+        cursor.execute("ALTER TABLE vault_requests ADD COLUMN request_by TEXT 
NOT NULL DEFAULT ''")
 
     conn.commit()
 
diff --git a/calm/package.py b/calm/package.py
index 84d956f..f00ad8d 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -1718,7 +1718,7 @@ def mark_fn(packages, po, v, certain_age, obs_threshold, 
vault_requests):
     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))
+            logging.info("package '%s' version '%s' not retained due to vault 
request" % (pn, v))
             return (Freshness.conditional, False)
 
     # otherwise, make no change
diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py
index 985257c..c63a59c 100644
--- a/calm/past_mistakes.py
+++ b/calm/past_mistakes.py
@@ -145,10 +145,6 @@ historical_provides = [
 # we use regex patterns to match version provides which might have been 
expired,
 # or not uploaded yet.
 nonexistent_provides = historical_provides + [
-    # python3
-    'python35',
-    'python35-gi',
-    'glade3',
     # python2
     'python2',
     'python2-devel',
@@ -173,8 +169,18 @@ nonexistent_provides = historical_provides + [
     'python2-pykde4',
     'python2-pyqt4',
     'python2-pyqt5',
+    # python35
+    'python35',
+    'python35-gi',
+    # python 36
+    'python36',
+    'python36-devel',
+    'python36-test',
+    'python36-tkinter',
+    # other
+    'glade3',
     'libtidy0_99_0',
-    # general
+    # general & future version patterns
     '_windows',
     r'perl5_\d+',
     r'ruby_\d+',