From 39f2b79797bdb95c7081f96d47dbc73b2d31c283 Mon Sep 17 00:00:00 2001 From: Connor Peet Date: Wed, 16 Nov 2022 11:26:31 -0800 Subject: [PATCH] cli: don't allow/check for updates when integrated Fixes https://github.com/microsoft/vscode-cli/issues/564 --- cli/src/tunnels/control_server.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cli/src/tunnels/control_server.rs b/cli/src/tunnels/control_server.rs index ce2a93e2f9bae..e4416b08a7555 100644 --- a/cli/src/tunnels/control_server.rs +++ b/cli/src/tunnels/control_server.rs @@ -17,6 +17,7 @@ use crate::util::http::{ DelegatedHttpRequest, DelegatedSimpleHttp, FallbackSimpleHttp, ReqwestSimpleHttp, }; use crate::util::io::SilentCopyProgress; +use crate::util::is_integrated_cli; use crate::util::sync::{new_barrier, Barrier}; use opentelemetry::trace::SpanKind; use opentelemetry::KeyValue; @@ -773,6 +774,13 @@ async fn handle_update( log: &log::Logger, params: &UpdateParams, ) -> Result { + if let Ok(true) = is_integrated_cli() { + return Ok(UpdateResult { + up_to_date: true, + did_update: false, + }); + } + let update_service = UpdateService::new(log.clone(), http.clone()); let updater = SelfUpdate::new(&update_service)?; let latest_release = updater.get_current_release().await?;