openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-11-09 20:50:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tighten marketplace root removal

Browse Source
This commit is contained in:
xli-oai
2026-05-06 01:39:26 -07:00
parent f9a907aebe
commit 03cc24113c
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/core-plugins/src/marketplace_remove.rs
+14 -3
View File
@@ -74,7 +74,12 @@ fn remove_marketplace_sync(
}
fn remove_marketplace_root(root: &Path) -> Result<Option<AbsolutePathBuf>, MarketplaceRemoveError> {
if !root.exists() {
if !root.try_exists().map_err(|err| {
MarketplaceRemoveError::Internal(format!(
"failed to check installed marketplace root {}: {err}",
root.display()
))
})? {
return Ok(None);
}
@@ -90,10 +95,16 @@ fn remove_marketplace_root(root: &Path) -> Result<Option<AbsolutePathBuf>, Marke
root.display()
))
})?;
let remove_result = if metadata.is_dir() {
let file_type = metadata.file_type();
let remove_result = if file_type.is_dir() {
fs::remove_dir_all(root)
} else {
} else if file_type.is_file() {
fs::remove_file(root)
} else {
return Err(MarketplaceRemoveError::Internal(format!(
"installed marketplace root {} is neither a file nor a directory",
root.display()
)));
};
remove_result.map_err(|err| {
MarketplaceRemoveError::Internal(format!(