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

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

[Jon Turney]

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

commit 32c105f0c12a63c93a1c8c7f640c947a90441828
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Feb 12 12:36:57 2023 +0000

    Improve hint parser error for embedded double quote

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

commit ec6935c3373cf9d233cda9ae83b9a760789fc724
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue Feb 7 15:14:46 2023 +0000

    Give deploy status feedback into scallywag
    
    Also: isolate each individual deploy, by putting them in a subdirectory
    of stagingdir named after the job id.


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

diff --git a/calm/calm.py b/calm/calm.py
index b97607d..7ea4739 100755
--- a/calm/calm.py
+++ b/calm/calm.py
@@ -167,7 +167,7 @@ def process_uploads(args, state):
     def deploy_upload(r):
         m = mlist[r.user]
         with logfilters.AttrFilter(maint=m.name):
-            return process_maintainer_uploads(args, state, all_packages, m, os.path.join(args.stagingdir, r.id), 'staging', scrub=True)
+            return process_maintainer_uploads(args, state, all_packages, m, os.path.join(args.stagingdir, str(r.id)), 'staging', scrub=True)
 
     scallywag_db.do_deploys(deploy_upload)
 
diff --git a/calm/scallywag_db.py b/calm/scallywag_db.py
index aa37b58..42ce381 100644
--- a/calm/scallywag_db.py
+++ b/calm/scallywag_db.py
@@ -47,8 +47,8 @@ def do_deploys(cb):
         rows = cur.fetchall()
 
         for r in rows:
-            status = 'deploy successful'
+            status = 'deploy succeeded'
             if not cb(r):
                 status = 'deploy failed'
 
-            conn.execute("UPDATE jobs SET status = '?' WHERE id = ?", (status, r.id))
+            conn.execute("UPDATE jobs SET status = ? WHERE id = ?", (status, r.id))