Skip to content

Commit c607abf

Browse files
authored
fix!: remove --debug from CLI and Python API (#2329)
1 parent 88edb17 commit c607abf

File tree

24 files changed

+18
-172
lines changed

24 files changed

+18
-172
lines changed

crates/rattler_build_core/src/build.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,6 @@ pub async fn run_build(
183183

184184
match output.run_build_script().await {
185185
Ok(_) => {}
186-
Err(InterpreterError::Debug(info)) => {
187-
tracing::info!("{}", info);
188-
return Err(miette::miette!(
189-
"Script not executed because debug mode is enabled"
190-
));
191-
}
192186
Err(InterpreterError::ExecutionFailed(_)) => {
193187
return Err(miette::miette!("Script failed to execute"));
194188
}

crates/rattler_build_core/src/metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! All the metadata that makes up a recipe file
22
pub use crate::types::{
3-
BuildConfiguration, Debug, Output, PlatformWithVirtualPackages, build_reindexed_channels,
3+
BuildConfiguration, Output, PlatformWithVirtualPackages, build_reindexed_channels,
44
};
55

66
#[cfg(test)]

crates/rattler_build_core/src/package_test/run_test.rs

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use rattler_build_recipe::stage1::{
1111
TestType,
1212
tests::{CommandsTest, DownstreamTest, PerlTest, PythonTest, PythonVersion, RTest, RubyTest},
1313
};
14-
use rattler_build_script::{Debug as ScriptDebug, Script, ScriptContent};
14+
use rattler_build_script::{Script, ScriptContent};
1515
use rattler_conda_types::{
1616
Channel, ChannelUrl, MatchSpec, ParseStrictness, Platform,
1717
compression_level::CompressionLevel,
@@ -38,11 +38,8 @@ use rattler::package_cache::PackageCache;
3838
use rattler_cache::validation::ValidationMode;
3939

4040
use crate::{
41-
env_vars,
42-
metadata::{Debug, PlatformWithVirtualPackages},
43-
render::solver::create_environment,
44-
source::copy_dir::CopyDir,
45-
tool_configuration,
41+
env_vars, metadata::PlatformWithVirtualPackages, render::solver::create_environment,
42+
source::copy_dir::CopyDir, tool_configuration,
4643
};
4744

4845
#[allow(missing_docs)]
@@ -201,7 +198,6 @@ impl Tests {
201198
None,
202199
None::<fn(&str) -> Result<String, String>>,
203200
None,
204-
ScriptDebug::new(false),
205201
)
206202
.await
207203
.map_err(|e| TestError::TestFailed(e.to_string()))?;
@@ -222,7 +218,6 @@ impl Tests {
222218
None,
223219
None::<fn(&str) -> Result<String, String>>,
224220
None,
225-
ScriptDebug::new(false),
226221
)
227222
.await
228223
.map_err(|e| TestError::TestFailed(e.to_string()))?;
@@ -291,8 +286,6 @@ pub struct TestConfiguration {
291286
pub tool_configuration: tool_configuration::Configuration,
292287
/// The output directory to create the test prefixes in (will be `output_dir/test`)
293288
pub output_dir: PathBuf,
294-
/// Debug mode yes, or no
295-
pub debug: Debug,
296289
/// Exclude packages newer than this date from the solver
297290
pub exclude_newer: Option<chrono::DateTime<chrono::Utc>>,
298291
}
@@ -751,7 +744,6 @@ async fn run_python_test_inner(
751744
None,
752745
None::<fn(&str) -> Result<String, String>>,
753746
None,
754-
ScriptDebug::new(config.debug.is_enabled()),
755747
)
756748
.await
757749
.map_err(|e| TestError::TestFailed(e.to_string()))?;
@@ -775,7 +767,6 @@ async fn run_python_test_inner(
775767
None,
776768
None::<fn(&str) -> Result<String, String>>,
777769
None,
778-
ScriptDebug::new(config.debug.is_enabled()),
779770
)
780771
.await
781772
.map_err(|e| TestError::TestFailed(e.to_string()))?;
@@ -858,7 +849,6 @@ async fn run_perl_test(
858849
None,
859850
None::<fn(&str) -> Result<String, String>>,
860851
None,
861-
ScriptDebug::new(config.debug.is_enabled()),
862852
)
863853
.await
864854
.map_err(|e| TestError::TestFailed(e.to_string()))?;
@@ -977,7 +967,6 @@ async fn run_commands_test(
977967
build_prefix.as_ref(),
978968
None::<fn(&str) -> Result<String, String>>,
979969
None,
980-
ScriptDebug::new(config.debug.is_enabled()),
981970
)
982971
.await
983972
.map_err(|e| TestError::TestFailed(e.to_string()))?;
@@ -1162,7 +1151,6 @@ async fn run_r_test(
11621151
None,
11631152
None::<fn(&str) -> Result<String, String>>,
11641153
None,
1165-
ScriptDebug::new(config.debug.is_enabled()),
11661154
)
11671155
.await
11681156
.map_err(|e| TestError::TestFailed(e.to_string()))?;
@@ -1240,7 +1228,6 @@ async fn run_ruby_test(
12401228
None,
12411229
None::<fn(&str) -> Result<String, String>>,
12421230
None,
1243-
ScriptDebug::new(config.debug.is_enabled()),
12441231
)
12451232
.await
12461233
.map_err(|e| TestError::TestFailed(e.to_string()))?;

crates/rattler_build_core/src/script.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ use std::{collections::HashMap, collections::HashSet};
1111

1212
// Re-export from rattler_build_script
1313
pub use rattler_build_script::{
14-
Debug as ScriptDebug, ExecutionArgs, InterpreterError, ResolvedScriptContents,
15-
SandboxArguments, SandboxConfiguration, Script, ScriptContent,
14+
ExecutionArgs, InterpreterError, ResolvedScriptContents, SandboxArguments,
15+
SandboxConfiguration, Script, ScriptContent,
1616
};
1717

1818
use crate::{
@@ -78,7 +78,6 @@ impl Output {
7878
execution_platform: Platform::current(),
7979
work_dir: work_dir.clone(),
8080
sandbox_config: self.build_configuration.sandbox_config().cloned(),
81-
debug: ScriptDebug::new(self.build_configuration.debug.is_enabled()),
8281
})
8382
}
8483

@@ -135,7 +134,6 @@ impl Output {
135134
build_prefix,
136135
Some(jinja_renderer),
137136
self.build_configuration.sandbox_config(),
138-
ScriptDebug::new(self.build_configuration.debug.is_enabled()),
139137
)
140138
.await?;
141139

crates/rattler_build_core/src/staging.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ use miette::{Context, IntoDiagnostic};
1414
use minijinja::Value;
1515
use rattler_build_jinja::{Jinja, Variable};
1616
use rattler_build_recipe::stage1::{InheritsFrom, StagingCache};
17-
use rattler_build_script::Debug as ScriptDebug;
1817
use rattler_build_types::NormalizedKey;
1918
use serde::{Deserialize, Serialize};
2019
use sha2::{Digest, Sha256};
@@ -298,7 +297,6 @@ impl Output {
298297
build_prefix,
299298
Some(jinja_renderer),
300299
self.build_configuration.sandbox_config(),
301-
ScriptDebug::new(self.build_configuration.debug.is_enabled()),
302300
)
303301
.await
304302
.into_diagnostic()?;

crates/rattler_build_core/src/types/build_configuration.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use rattler_solve::{ChannelPriority, SolveStrategy};
99
use serde::{Deserialize, Serialize};
1010

1111
use crate::types::{
12-
Debug, Directories, PackageIdentifier, PackagingSettings, PlatformWithVirtualPackages,
12+
Directories, PackageIdentifier, PackagingSettings, PlatformWithVirtualPackages,
1313
};
1414

1515
use rattler_build_script::SandboxConfiguration;
@@ -59,9 +59,6 @@ pub struct BuildConfiguration {
5959
/// The configuration for the sandbox
6060
#[serde(skip_serializing, default)]
6161
pub sandbox_config: Option<SandboxConfiguration>,
62-
/// Whether to enable debug output in build scripts
63-
#[serde(skip_serializing, default)]
64-
pub debug: Debug,
6562
/// Exclude packages newer than this date from the solver
6663
#[serde(skip_serializing, default)]
6764
pub exclude_newer: Option<chrono::DateTime<chrono::Utc>>,

crates/rattler_build_core/src/types/mod.rs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,6 @@ impl<'de> Deserialize<'de> for PlatformWithVirtualPackages {
114114
}
115115
}
116116

117-
/// A newtype wrapper around a boolean indicating whether debug output is enabled
118-
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]
119-
pub struct Debug(bool);
120-
121-
impl Debug {
122-
/// Create a new Debug instance
123-
pub fn new(debug: bool) -> Self {
124-
Self(debug)
125-
}
126-
127-
/// Returns true if debug output is enabled
128-
pub fn is_enabled(&self) -> bool {
129-
self.0
130-
}
131-
}
132-
133117
/// A package identifier
134118
#[derive(Serialize, Deserialize, Debug, Clone)]
135119
pub struct PackageIdentifier {

crates/rattler_build_script/src/execution.rs

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ pub struct ExecutionArgs {
3838

3939
/// The sandbox configuration to use for the script execution
4040
pub sandbox_config: Option<SandboxConfiguration>,
41-
42-
/// Whether to enable debug output
43-
pub debug: Debug,
4441
}
4542

4643
impl ExecutionArgs {
@@ -116,28 +113,6 @@ impl ResolvedScriptContents {
116113
}
117114
}
118115

119-
/// Debug mode for script execution
120-
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
121-
pub struct Debug(bool);
122-
123-
impl Debug {
124-
/// Create a new Debug mode
125-
pub fn new(enabled: bool) -> Self {
126-
Self(enabled)
127-
}
128-
129-
/// Check if debug mode is enabled
130-
pub fn is_enabled(&self) -> bool {
131-
self.0
132-
}
133-
}
134-
135-
impl From<bool> for Debug {
136-
fn from(enabled: bool) -> Self {
137-
Self(enabled)
138-
}
139-
}
140-
141116
impl Script {
142117
/// Run the script with the given parameters
143118
///
@@ -157,7 +132,6 @@ impl Script {
157132
build_prefix: Option<&PathBuf>,
158133
jinja_renderer: Option<F>,
159134
sandbox_config: Option<&SandboxConfiguration>,
160-
debug: Debug,
161135
) -> Result<(), crate::InterpreterError>
162136
where
163137
F: Fn(&str) -> Result<String, String>,
@@ -226,7 +200,6 @@ impl Script {
226200
execution_platform: Platform::current(),
227201
work_dir,
228202
sandbox_config: sandbox_config.cloned(),
229-
debug,
230203
};
231204

232205
crate::execution::run_script(exec_args, interpreter).await?;

crates/rattler_build_script/src/interpreter/bash.rs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ pub struct BashInterpreter;
1212
fn print_debug_info(args: &ExecutionArgs) -> String {
1313
let mut output = String::new();
1414

15-
if args.debug.is_enabled() {
16-
output.push_str("\nDebug mode enabled - not executing the script.\n\n");
17-
} else {
18-
output.push_str("\nScript execution failed.\n\n");
19-
}
15+
output.push_str("\nScript execution failed.\n\n");
2016

2117
output.push_str(&format!(" Work directory: {}\n", args.work_dir.display()));
2218
output.push_str(&format!(" Prefix: {}\n", args.run_prefix.display()));
@@ -57,15 +53,7 @@ impl Interpreter for BashInterpreter {
5753
}
5854

5955
let build_script_path_str = build_script_path.to_string_lossy().to_string();
60-
let mut cmd_args = vec!["bash"];
61-
if args.debug.is_enabled() {
62-
cmd_args.push("-x");
63-
}
64-
cmd_args.push(&build_script_path_str);
65-
66-
if args.debug.is_enabled() {
67-
return Err(InterpreterError::Debug(print_debug_info(&args)));
68-
}
56+
let cmd_args = vec!["bash", &build_script_path_str];
6957

7058
let output = run_process_with_replacements(
7159
&cmd_args,

crates/rattler_build_script/src/interpreter/cmd_exe.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@ use super::{CMDEXE_PREAMBLE, Interpreter, InterpreterError, find_interpreter};
99

1010
fn print_debug_info(args: &ExecutionArgs) -> String {
1111
let mut output = String::new();
12-
if args.debug.is_enabled() {
13-
output.push_str("\nDebug mode enabled - not executing the script.\n\n");
14-
} else {
15-
output.push_str("\nScript execution failed.\n\n")
16-
}
12+
13+
output.push_str("\nScript execution failed.\n\n");
1714

1815
output.push_str(&format!(" Work directory: {}\n", args.work_dir.display()));
1916
output.push_str(&format!(" Prefix: {}\n", args.run_prefix.display()));
@@ -60,10 +57,6 @@ impl Interpreter for CmdExeInterpreter {
6057
let build_script_path_str = build_script_path.to_string_lossy().to_string();
6158
let cmd_args = ["cmd.exe", "/d", "/c", &build_script_path_str];
6259

63-
if args.debug.is_enabled() {
64-
return Err(InterpreterError::Debug(print_debug_info(&args)));
65-
}
66-
6760
let output = run_process_with_replacements(
6861
&cmd_args,
6962
&args.work_dir,

0 commit comments

Comments
 (0)