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

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

[Jon Turney]

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

commit cf82e977370542a8c94e47886fcdee5146a2ddf6
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Wed Dec 18 17:20:46 2024 +0000

    CI: Drop testing on python 3.7
    
    Drop testing on python 3.7, not available on ubuntu-latest.

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

commit 70fa7c95a3b7cdfae537ddb56ad137935392fc27
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Wed Dec 18 17:09:08 2024 +0000

    Improve reliability of detecting upload available.
    
    Detecting a !ready file being placed into the upload directory is
    problematic, due to possible races in setting watches on a just created
    directory.
    
    So instead, we just watch for a file touched when the sftp session ends.
    
    This means we more reliably detect when a !ready file has been uploaded,
    at the cost of doing extra scans (in the probably rare case) when a sftp
    session hasn't uploaded a !ready file.


Diff:
---
 .github/workflows/calm.yaml | 2 +-
 calm/calm.py                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/calm.yaml b/.github/workflows/calm.yaml
index 3120598..5e36712 100644
--- a/.github/workflows/calm.yaml
+++ b/.github/workflows/calm.yaml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9, '3.10', '3.11']
+        python-version: [3.8, 3.9, '3.10', '3.11']
 
     steps:
       - uses: actions/checkout@v3
diff --git a/calm/calm.py b/calm/calm.py
index 02e613b..6bbf43a 100755
--- a/calm/calm.py
+++ b/calm/calm.py
@@ -814,7 +814,7 @@ def do_daemon(args, state):
                                     action |= Event.read_relarea
                             elif path.startswith(args.stagingdir) and (filename != 'tmp'):
                                 action |= Event.read_uploads
-                            elif (path.startswith(args.homedir)) and (filename == "!ready"):
+                            elif (path.startswith(args.homedir)) and (filename == ".sftp-session-close"):
                                 action |= Event.read_uploads
                         else:
                             # None means no more events are currently available, so