Allow rsync stderr in the form used by github actions

DiamondLightSource · Aug 22, 2024 · f9aa9c3 · f9aa9c3
1 parent eda8036
commit f9aa9c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
           EOF
 
           cat <<EOF >Dockerfile
-          FROM rabbitmq:3.12-management
+          FROM rabbitmq:3.13-management
           COPY rabbitmq.conf /etc/rabbitmq/rabbitmq.conf
           EOF
 

diff --git a/src/murfey/util/rsync.py b/src/murfey/util/rsync.py
@@ -169,8 +169,8 @@ def _parse_rsync_stderr(self, stderr: bytes):
         if stringy_stderr:
             if (
                 stringy_stderr.startswith("rsync: link_stat")
-                and "failed" in stringy_stderr
-            ):
+                or stringy_stderr.startswith("rsync: [sender] link_stat")
+            ) and "failed" in stringy_stderr:
                 failed_msg = stringy_stderr.split()
                 self._failed_tmp.append(
                     failed_msg[failed_msg.index("failed:") - 1].replace('"', "")