publisher, deployer: report ssh failure instead of BrokenPipeError (0.9.8)

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

srcpkgs/deployer/files/python/deployer/__init__.py

@@ -1,2 +1,2 @@
 """Deploy local projects to the home server over ssh + rsync."""
-__version__ = "0.3.0"
+__version__ = "0.3.1"

srcpkgs/deployer/files/python/deployer/remote.py

@@ -31,8 +31,11 @@ def _stream(cmd: list[str], log: Log | None, stdin: str | None = None, cwd=None,
                             stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True, cwd=cwd, env=env,
                             errors="replace")
     if stdin is not None:
-        proc.stdin.write(stdin)
-        proc.stdin.close()
+        try:
+            proc.stdin.write(stdin)
+            proc.stdin.close()
+        except BrokenPipeError:
+            pass  # ssh already exited; its message is in the output below
     out = []
     for line in proc.stdout:
         line = line.rstrip("\n")
@@ -57,7 +60,7 @@ def run(server: Server, script: str, log: Log | None = None, check: bool = True,
     """Run a bash script on the server; values become shell variables in front of it."""
     body = "set -uo pipefail\n" + shell_vars(**values) + script
     rc, out = _stream(["ssh", *ssh_opts(server), server.target, "bash", "-s"], log, stdin=body)
-    if check and rc != 0:
+    if rc == 255 or (check and rc != 0):
         raise RemoteError(f"remote command failed (exit {rc})" + (f": {out.splitlines()[-1]}" if out else ""))
     return out
 

srcpkgs/deployer/files/tests/test_core.py

@@ -1,3 +1,4 @@
+import os
 from pathlib import Path
 
 import pytest
@@ -175,3 +176,14 @@ def test_python_config_layout(tmp_path):
     plan.dest = "/home/user/app/docker/stack"
     plan.app = config.App(name="stack", kind="docker", src=str(tmp_path), dest="docker/stack")
     assert get("docker").config_items(plan) == [(".env", "/home/user/app/configs/docker/stack.env")]
+
+
+def test_ssh_exits_early(tmp_path, monkeypatch):
+    # ssh dies at once (e.g. unresolvable host): the broken pipe must surface as RemoteError with its message
+    fake = tmp_path / "ssh"
+    fake.write_text("#!/bin/sh\necho \"ssh: Could not resolve hostname\" >&2\nexit 255\n")
+    fake.chmod(0o755)
+    monkeypatch.setenv("PATH", f"{tmp_path}:{os.environ['PATH']}")
+    srv = config.Server(host="nohost.invalid", user="u")
+    with pytest.raises(remote.RemoteError, match="Could not resolve"):
+        remote.run(srv, "x" * 5_000_000, check=False)

srcpkgs/deployer/template

@@ -3,7 +3,7 @@
 # Differences from the upstream: the config is in ~/.config/deployer (see bin/deploy) and
 # history.log is in ~/.local/state/deployer.
 pkgname=deployer
-version=0.3.0
+version=0.3.1
 revision=1
 create_wrksrc=yes
 hostmakedepends="python3"

srcpkgs/publisher/files/python/publisher/__init__.py

@@ -1,2 +1,2 @@
 """Publish apk, AppImage and binaries to the apps page of the home Tomcat over ssh + rsync."""
-__version__ = "0.3.0"
+__version__ = "0.3.1"

srcpkgs/publisher/files/python/publisher/remote.py

@@ -26,8 +26,11 @@ def _stream(cmd: list[str], log: Log | None, stdin: str | None = None, cwd=None,
                             stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True, cwd=cwd, env=env,
                             errors="replace")
     if stdin is not None:
-        proc.stdin.write(stdin)
-        proc.stdin.close()
+        try:
+            proc.stdin.write(stdin)
+            proc.stdin.close()
+        except BrokenPipeError:
+            pass  # ssh already exited; its message is in the output below
     out = []
     for line in proc.stdout:
         line = line.rstrip("\n")
@@ -52,7 +55,7 @@ def run(server: Server, script: str, log: Log | None = None, check: bool = True,
     """Run a bash script on the server; values become shell variables in front of it."""
     body = "set -uo pipefail\n" + shell_vars(**values) + script
     rc, out = _stream(["ssh", *ssh_opts(server), server.target, "bash", "-s"], log, stdin=body)
-    if check and rc != 0:
+    if rc == 255 or (check and rc != 0):
         raise RemoteError(f"remote command failed (exit {rc})" + (f": {out.splitlines()[-1]}" if out else ""))
     return out
 

srcpkgs/publisher/files/tests/test_core.py

@@ -3,7 +3,7 @@ from pathlib import Path
 
 import pytest
 
-from publisher import config, detect, packages, pipeline
+from publisher import config, detect, packages, pipeline, remote
 from publisher.packages import BINARY, KINDS, Published
 
 APK, APPIMAGE, TARGZ = KINDS[0], KINDS[1], KINDS[-1]
@@ -215,3 +215,14 @@ def test_detect_go(tmp_path):
 def test_site_name_cleanup():
     assert detect._site_name("Das Pressure 2") == "DasPressure2"
     assert os.path.basename(detect._home(Path.home() / "a")) == "a"
+
+
+def test_ssh_exits_early(tmp_path, monkeypatch):
+    # ssh dies at once (e.g. unresolvable host): the broken pipe must surface as RemoteError with its message
+    fake = tmp_path / "ssh"
+    fake.write_text("#!/bin/sh\necho \"ssh: Could not resolve hostname\" >&2\nexit 255\n")
+    fake.chmod(0o755)
+    monkeypatch.setenv("PATH", f"{tmp_path}:{os.environ['PATH']}")
+    srv = config.Server(host="nohost.invalid", user="u")
+    with pytest.raises(remote.RemoteError, match="Could not resolve"):
+        remote.run(srv, "x" * 5_000_000, check=False)

srcpkgs/publisher/template

@@ -3,7 +3,7 @@
 # Differences from the upstream: the config is in ~/.config/publisher (see bin/publish) and
 # history.log is in ~/.local/state/publisher.
 pkgname=publisher
-version=0.3.0
+version=0.3.1
 revision=1
 create_wrksrc=yes
 hostmakedepends="python3"