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

Jon Turney jturney@sourceware.org
Sun Feb 12 23:19:42 GMT 2023




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

commit 57074613ba08e7d101e1836ce838e16f9a85b48f
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Feb 12 23:15:34 2023 +0000

    Rework how 'OBSOLETE' is handled in package list
    
    Previously, we'd do some rearrangement of the release area, so the
    obsoleted package would be moved under the obsoleting package, so it
    didn't need to exist at all in the package list and we could safely
    ignore it.
    
    We don't need or want to bother with that now, so let obsolete packages
    paths exist.
    
    Future work: This needs some thought about how we want to work.  Perhaps
    prohibit uploads?  Perhaps error if the package marked OBSOLETE isn't
    actually obsoleted by something?

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

commit 2bcfd3e6beae8e78a8570f669d822d9bd6e90fc5
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=1c93887c031f8d320cee79524b1349a0f2bb75cb

commit 1c93887c031f8d320cee79524b1349a0f2bb75cb
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/maintainers.py  | 11 +++++++++--
 calm/scallywag_db.py |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/calm/maintainers.py b/calm/maintainers.py
index cc75040..d0497cb 100644
--- a/calm/maintainers.py
+++ b/calm/maintainers.py
@@ -168,9 +168,13 @@ def _read_pkglist(pkglist):
                 if status_match:
                     status = status_match.group(1)
 
-                    # ignore packages marked as 'OBSOLETE'
+                    # packages marked as 'OBSOLETE' are obsolete
                     if status == 'OBSOLETE':
-                        continue
+                        # obsolete packages have no maintainer
+                        #
+                        # XXX: perhaps disallow even trusties to upload (or
+                        # warn if they try?)
+                        m = ''
 
                     # orphaned packages are assigned to 'ORPHANED'
                     elif status == 'ORPHANED':
@@ -190,6 +194,9 @@ def _read_pkglist(pkglist):
                 # joint maintainers are separated by '/'
                 maintainers = list()
                 for name in m.split('/'):
+                    if not name:
+                        continue
+
                     name = name.strip()
 
                     # is the maintainer name ascii?
diff --git a/calm/scallywag_db.py b/calm/scallywag_db.py
index 42ce381..a310c55 100644
--- a/calm/scallywag_db.py
+++ b/calm/scallywag_db.py
@@ -52,3 +52,5 @@ def do_deploys(cb):
                 status = 'deploy failed'
 
             conn.execute("UPDATE jobs SET status = ? WHERE id = ?", (status, r.id))
+
+        conn.commit()



More information about the Cygwin-apps-cvs mailing list