From 747e2af67064854cc1406c311cf85c3eb4d976a4 Mon Sep 17 00:00:00 2001
From: Oliver Sanders <oliver.sanders@metoffice.gov.uk>
Date: Thu, 27 Jun 2024 17:48:18 +0100
Subject: [PATCH 1/2] play: print the logo to the user's terminal only (#6170)

---
 changes.d/fix.6170.md      |  1 +
 cylc/flow/scheduler_cli.py | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 changes.d/fix.6170.md

diff --git a/changes.d/fix.6170.md b/changes.d/fix.6170.md
new file mode 100644
index 00000000000..1675c7dfe7c
--- /dev/null
+++ b/changes.d/fix.6170.md
@@ -0,0 +1 @@
+Fix an issue where the Cylc logo could appear in the workflow log.
diff --git a/cylc/flow/scheduler_cli.py b/cylc/flow/scheduler_cli.py
index d25be809325..c014697160a 100644
--- a/cylc/flow/scheduler_cli.py
+++ b/cylc/flow/scheduler_cli.py
@@ -400,12 +400,12 @@ async def scheduler_cli(
     # upgrade the workflow DB (after user has confirmed upgrade)
     _upgrade_database(db_file)
 
-    # re-execute on another host if required
-    _distribute(options.host, workflow_id_raw, workflow_id, options.color)
-
     # print the start message
     _print_startup_message(options)
 
+    # re-execute on another host if required
+    _distribute(options.host, workflow_id_raw, workflow_id, options.color)
+
     # setup the scheduler
     # NOTE: asyncio.run opens an event loop, runs your coro,
     #       then shutdown async generators and closes the event loop
@@ -561,10 +561,14 @@ def _upgrade_database(db_file: Path) -> None:
 
 
 def _print_startup_message(options):
-    """Print the Cylc header including the CLI logo."""
+    """Print the Cylc header including the CLI logo to the user's terminal."""
     if (
         cylc.flow.flags.verbosity > -1
         and (options.no_detach or options.format == 'plain')
+        # don't print the startup message on reinvocation (note
+        # --host=localhost is the best indication we have that reinvokation has
+        # happened)
+        and options.host != 'localhost'
     ):
         print(
             cparse(

From 7042afa601f7d1fce2051e5be7dc27e3152f3199 Mon Sep 17 00:00:00 2001
From: Tim Pillinger <26465611+wxtim@users.noreply.github.com>
Date: Fri, 28 Jun 2024 12:32:23 +0100
Subject: [PATCH 2/2] Fix mistake in towncrier usage (#6179)

---
 CHANGES.md                             | 4 ++++
 changes.d/{fix.6170.md => 6170.fix.md} | 0
 changes.d/fix.5924.md                  | 1 -
 changes.d/fix.6109.md                  | 1 -
 4 files changed, 4 insertions(+), 2 deletions(-)
 rename changes.d/{fix.6170.md => 6170.fix.md} (100%)
 delete mode 100644 changes.d/fix.5924.md
 delete mode 100644 changes.d/fix.6109.md

diff --git a/CHANGES.md b/CHANGES.md
index aa2e43827b6..43b40c86eed 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -89,6 +89,8 @@ $ towncrier create <PR-number>.<break|feat|fix>.md --content "Short description"
 
 [#6067](https://github.com/cylc/cylc-flow/pull/6067) - Fixed a bug that sometimes allowed suicide-triggered or manually removed tasks to be added back later.
 
+[#6109](https://github.com/cylc/cylc-flow/pull/6109) - Fixed bug affecting job submission where the list of bad hosts was not always reset correctly.
+
 [#6123](https://github.com/cylc/cylc-flow/pull/6123) - Allow long-format datetime cycle points in IDs used on the command line.
 
 ## __cylc-8.2.7 (Released 2024-05-15)__
@@ -119,6 +121,8 @@ $ towncrier create <PR-number>.<break|feat|fix>.md --content "Short description"
 
 ### 🔧 Fixes
 
+[#5924](https://github.com/cylc/cylc-flow/pull/5924) - Validation: a cycle offset can only appear on the right of a dependency if the task's cycling is defined elsewhere with no offset.
+
 [#5933](https://github.com/cylc/cylc-flow/pull/5933) - Fixed bug in `cylc broadcast` (and the GUI Edit Runtime command) where everything after a `#` character in a setting would be stripped out.
 
 [#5959](https://github.com/cylc/cylc-flow/pull/5959) - Fix an issue where workflow "timeout" events were not fired in all situations when they should have been.
diff --git a/changes.d/fix.6170.md b/changes.d/6170.fix.md
similarity index 100%
rename from changes.d/fix.6170.md
rename to changes.d/6170.fix.md
diff --git a/changes.d/fix.5924.md b/changes.d/fix.5924.md
deleted file mode 100644
index 7ce2caf7777..00000000000
--- a/changes.d/fix.5924.md
+++ /dev/null
@@ -1 +0,0 @@
-Validation: a cycle offset can only appear on the right of a dependency if the task's cycling is defined elsewhere with no offset.
\ No newline at end of file
diff --git a/changes.d/fix.6109.md b/changes.d/fix.6109.md
deleted file mode 100644
index 36f22c3d4fc..00000000000
--- a/changes.d/fix.6109.md
+++ /dev/null
@@ -1 +0,0 @@
-Fixed bug affecting job submission where the list of bad hosts was not always reset correctly.
\ No newline at end of file