clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 22:54:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

More fixes

Browse Source
This commit is contained in:
Eric Traut
2026-01-13 13:28:40 -08:00
parent 3a69275d8f
commit a1e308b77f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
codex-rs/core/src/config/mod.rs
View File

@@ -435,8 +435,7 @@ impl ConfigBuilder {
// Note that each layer in ConfigLayerStack should have resolved
// relative paths to absolute paths based on the parent folder of the
// respective config file, so we should be safe to deserialize without
// AbsolutePathBufGuard here.
// respective config file, so the base-dir guard is not needed here.
let config_toml = deserialize_config_toml_with_base(merged_toml, None)?;
Config::load_config_with_layer_stack(
config_toml,
@@ -2391,7 +2390,7 @@ trust_level = "trusted"
load_config_layers_state(codex_home.path(), Some(cwd), &Vec::new(), overrides).await?;
let cfg = deserialize_config_toml_with_base(
config_layer_stack.effective_config(),
codex_home.path(),
Some(codex_home.path()),
)
.map_err(|e| {
tracing::error!("Failed to deserialize overridden config: {e}");
@@ -2518,7 +2517,7 @@ trust_level = "trusted"
let cfg = deserialize_config_toml_with_base(
config_layer_stack.effective_config(),
codex_home.path(),
Some(codex_home.path()),
)
.map_err(|e| {
tracing::error!("Failed to deserialize overridden config: {e}");