Merge remote-tracking branch 'origin/master' into shell_subst_env_vars

3 files changed, 5 insertions, 2 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 6ec23d0..1e133e1 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -84,6 +84,8 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       a function which will be called to obtain an environment which will be used in the shell
       command of some Action.
     - Updated ninja scons daemon scripts to output errors to stderr as well as the daemon log.
+    - Fix typo in ninja scons daemon startup which causes ConnectionRefusedError to not retry 
+      to connect to the server during start up.
 
   From Mats Wichmann:
     - Tweak the way default site_scons paths on Windows are expressed to
diff --git a/RELEASE.txt b/RELEASE.txt
index 9678e30..9ae5c57 100755
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -92,7 +92,8 @@ FIXES
 - Restore the ability of the content-timestamp decider to see that a
   a source which is a symlink has changed if the file-system target of
   that link has been modified (issue #3880)
-
+- Fix typo in ninja scons daemon startup which causes ConnectionRefusedError to not retry 
+  to connect to the server during start up.
 
 IMPROVEMENTS
 ------------
diff --git a/SCons/Tool/ninja/ninja_run_daemon.py b/SCons/Tool/ninja/ninja_run_daemon.py
index f525857..297bcf4 100644
--- a/SCons/Tool/ninja/ninja_run_daemon.py
+++ b/SCons/Tool/ninja/ninja_run_daemon.py
@@ -125,7 +125,7 @@ if not os.path.exists(ninja_builddir / "scons_daemon_dirty"):
         except ConnectionRefusedError:
             logging.debug(f"Server not ready, server PID: {p.pid}")
             time.sleep(1)
-            if p.poll is not None:
+            if p.poll() is not None:
                 log_error(f"Server process died, aborting: {p.returncode}")
                 sys.exit(p.returncode)
         except ConnectionResetError: