From 257ca096d014c59a769b462c6e1d435fc3534558 Mon Sep 17 00:00:00 2001 From: Boni Garcia Date: Wed, 27 Mar 2024 00:34:14 +0100 Subject: [PATCH] [rust] Enhance logic to uncompress DEB files and set toolchain version --- WORKSPACE | 7 ++++++- rust/src/files.rs | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index b85b8278bebbd..4c557557cb8f4 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -239,7 +239,12 @@ load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_regi rules_rust_dependencies() -rust_register_toolchains() +rust_register_toolchains( + edition = "2021", + versions = [ + "1.77.0", + ], +) load("@rules_rust//crate_universe:defs.bzl", "crates_repository") diff --git a/rust/src/files.rs b/rust/src/files.rs index a27e17650764d..3764dd0d58325 100644 --- a/rust/src/files.rs +++ b/rust/src/files.rs @@ -273,8 +273,10 @@ pub fn uncompress_deb( opt_edge_str, target_str )); create_parent_path_if_not_exists(target)?; - let output = run_shell_command_by_os(os, command)?; - if output.is_empty() { + run_shell_command_by_os(os, command)?; + let target_path = Path::new(target); + if target_path.parent().unwrap().read_dir()?.next().is_none() { + println!("IS EMPTY"); fs::rename(&opt_edge_str, &target_str)?; }