Skip to content

Treat deleted Windows registry keys as equivalent to missing ones #16194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zanieb merged 1 commit into from
Oct 8, 2025
Merged

Treat deleted Windows registry keys as equivalent to missing ones #16194

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions crates/uv-python/src/windows_registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use thiserror::Error;
use tracing::debug;
use uv_platform::Arch;
use uv_warnings::{warn_user, warn_user_once};
use windows::Win32::Foundation::ERROR_FILE_NOT_FOUND;
use windows::Win32::Foundation::{ERROR_FILE_NOT_FOUND, ERROR_KEY_DELETED};
use windows::Win32::System::Registry::{KEY_WOW64_32KEY, KEY_WOW64_64KEY};
use windows::core::HRESULT;
use windows_registry::{CURRENT_USER, HSTRING, Key, LOCAL_MACHINE, Value};
Expand Down Expand Up @@ -213,7 +213,9 @@ pub fn remove_registry_entry<'a>(
if all {
debug!("Removing registry key HKCU:\\{}", astral_key);
if let Err(err) = CURRENT_USER.remove_tree(&astral_key) {
if err.code() == HRESULT::from(ERROR_FILE_NOT_FOUND) {
if err.code() == HRESULT::from(ERROR_FILE_NOT_FOUND)
|| err.code() == HRESULT::from(ERROR_KEY_DELETED)
{
debug!("No registry entries to remove, no registry key {astral_key}");
} else {
warn_user!("Failed to clear registry entries under {astral_key}: {err}");
Expand All @@ -227,7 +229,9 @@ pub fn remove_registry_entry<'a>(
let python_entry = format!("{astral_key}\\{python_tag}");
debug!("Removing registry key HKCU:\\{}", python_entry);
if let Err(err) = CURRENT_USER.remove_tree(&python_entry) {
if err.code() == HRESULT::from(ERROR_FILE_NOT_FOUND) {
if err.code() == HRESULT::from(ERROR_FILE_NOT_FOUND)
|| err.code() == HRESULT::from(ERROR_KEY_DELETED)
{
debug!(
"No registry entries to remove for {}, no registry key {}",
installation.key(),
Expand All @@ -253,7 +257,10 @@ pub fn remove_orphan_registry_entries(installations: &[ManagedPythonInstallation
let astral_key = format!("Software\\Python\\{COMPANY_KEY}");
let key = match CURRENT_USER.open(&astral_key) {
Ok(subkeys) => subkeys,
Err(err) if err.code() == HRESULT::from(ERROR_FILE_NOT_FOUND) => {
Err(err)
if err.code() == HRESULT::from(ERROR_FILE_NOT_FOUND)
|| err.code() == HRESULT::from(ERROR_KEY_DELETED) =>
{
return;
}
Err(err) => {
Expand All @@ -265,7 +272,10 @@ pub fn remove_orphan_registry_entries(installations: &[ManagedPythonInstallation
// Separate assignment since `keys()` creates a borrow.
let subkeys = match key.keys() {
Ok(subkeys) => subkeys,
Err(err) if err.code() == HRESULT::from(ERROR_FILE_NOT_FOUND) => {
Err(err)
if err.code() == HRESULT::from(ERROR_FILE_NOT_FOUND)
|| err.code() == HRESULT::from(ERROR_KEY_DELETED) =>
{
return;
}
Err(err) => {
Expand All @@ -281,7 +291,9 @@ pub fn remove_orphan_registry_entries(installations: &[ManagedPythonInstallation
let python_entry = format!("{astral_key}\\{subkey}");
debug!("Removing orphan registry key HKCU:\\{}", python_entry);
if let Err(err) = CURRENT_USER.remove_tree(&python_entry) {
if err.code() == HRESULT::from(ERROR_FILE_NOT_FOUND) {
if err.code() == HRESULT::from(ERROR_FILE_NOT_FOUND)
|| err.code() == HRESULT::from(ERROR_KEY_DELETED)
{
continue;
}
// TODO(konsti): We don't have an installation key here.
Expand Down
Loading
⚡