From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id B22A23858D37; Sun, 12 Feb 2023 19:28:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B22A23858D37 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676230128; bh=Lev+oCnIvbwPriCh0e3FApp4kqvz0DVFS1/dTUcLE+g=; h=To:Subject:Date:From:From; b=Z1oQYL/Ss8F83i7nX9TiuFK4lzSLLQhS1vexQfa6bZyz2TtVl+3C8cZJ90gz3UiN5 OEr7M/V82E4nlel2GzimXlCVYtwP0Qky10Jp+eMbGL1PDtTdRakHw+kG1LY+YXLVS1 0d40tBQZAiA/FpcigUFhlDctI9mTNgNM0yfbYL24= To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20230209-5-g32c105f X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: b3b21d19d11cd8bec59f803131d7e6f22a42df1b X-Git-Newrev: 32c105f0c12a63c93a1c8c7f640c947a90441828 Message-Id: <20230212192848.B22A23858D37@sourceware.org> Date: Sun, 12 Feb 2023 19:28:48 +0000 (GMT) From: Jon Turney List-Id: https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=32c105f0c12a63c93a1c8c7f640c947a90441828 commit 32c105f0c12a63c93a1c8c7f640c947a90441828 Author: Jon Turney 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 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))