diff --git a/core/src/context/config.rs b/core/src/context/config.rs index f47ee8110..fb76f96ce 100644 --- a/core/src/context/config.rs +++ b/core/src/context/config.rs @@ -93,8 +93,13 @@ impl ContextConfig for ClientConfig { self.host = self.host.take().or(other.host); self.registry = self.registry.take().or(other.registry); self.registry_hostname = self.registry_hostname.take().or(other.registry_hostname); + self.registry_listen = self.registry_listen.take().or(other.registry_listen); + self.s9pk_s3base = self.s9pk_s3base.take().or(other.s9pk_s3base); + self.s9pk_s3bucket = self.s9pk_s3bucket.take().or(other.s9pk_s3bucket); self.tunnel = self.tunnel.take().or(other.tunnel); + self.tunnel_listen = self.tunnel_listen.take().or(other.tunnel_listen); self.proxy = self.proxy.take().or(other.proxy); + self.socks_listen = self.socks_listen.take().or(other.socks_listen); self.cookie_path = self.cookie_path.take().or(other.cookie_path); self.developer_key_path = self.developer_key_path.take().or(other.developer_key_path); } diff --git a/core/src/s9pk/rpc.rs b/core/src/s9pk/rpc.rs index 4c9180dbe..3c16d27ba 100644 --- a/core/src/s9pk/rpc.rs +++ b/core/src/s9pk/rpc.rs @@ -318,6 +318,7 @@ async fn publish(ctx: CliContext, S9pkPath { s9pk: s9pk_path }: S9pkPath) -> Res .arg("-P") .arg(s9pk_path) .arg(s3dest.as_str()) + .capture(false) .invoke(ErrorKind::Network) .await?; crate::registry::package::add::cli_add_package_impl(ctx, s9pk, vec![s3url], false).await