mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-26 22:04:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source 
I noticed this flaked in a snapshot.

We may want to encode this in a helper at some point.
This commit is contained in:
Zanie Blue 2025-10-08 12:24:36 -05:00 • committed by GitHub
parent a681fe9976
commit 1051709792
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/uv-python/src/windows_registry.rs
View file

@ -12,7 +12,7 @@ use thiserror::Error;
use tracing::debug; use tracing::debug;
use uv_platform::Arch; use uv_platform::Arch;
use uv_warnings::{warn_user, warn_user_once}; 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::Win32::System::Registry::{KEY_WOW64_32KEY, KEY_WOW64_64KEY};
use windows::core::HRESULT; use windows::core::HRESULT;
use windows_registry::{CURRENT_USER, HSTRING, Key, LOCAL_MACHINE, Value}; use windows_registry::{CURRENT_USER, HSTRING, Key, LOCAL_MACHINE, Value};
@ -213,7 +213,9 @@ pub fn remove_registry_entry<'a>(
if all { if all {
debug!("Removing registry key HKCU:\\{}", astral_key); debug!("Removing registry key HKCU:\\{}", astral_key);
if let Err(err) = CURRENT_USER.remove_tree(&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}"); debug!("No registry entries to remove, no registry key {astral_key}");
} else { } else {
warn_user!("Failed to clear registry entries under {astral_key}: {err}"); warn_user!("Failed to clear registry entries under {astral_key}: {err}");
@ -227,7 +229,9 @@ pub fn remove_registry_entry<'a>(
let python_entry = format!("{astral_key}\\{python_tag}"); let python_entry = format!("{astral_key}\\{python_tag}");
debug!("Removing registry key HKCU:\\{}", python_entry); debug!("Removing registry key HKCU:\\{}", python_entry);
if let Err(err) = CURRENT_USER.remove_tree(&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!( debug!(
"No registry entries to remove for {}, no registry key {}", "No registry entries to remove for {}, no registry key {}",
installation.key(), installation.key(),
@ -253,7 +257,10 @@ pub fn remove_orphan_registry_entries(installations: &[ManagedPythonInstallation
let astral_key = format!("Software\\Python\\{COMPANY_KEY}"); let astral_key = format!("Software\\Python\\{COMPANY_KEY}");
let key = match CURRENT_USER.open(&astral_key) { let key = match CURRENT_USER.open(&astral_key) {
Ok(subkeys) => subkeys, 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; return;
} }
Err(err) => { Err(err) => {
@ -265,7 +272,10 @@ pub fn remove_orphan_registry_entries(installations: &[ManagedPythonInstallation
// Separate assignment since `keys()` creates a borrow. // Separate assignment since `keys()` creates a borrow.
let subkeys = match key.keys() { let subkeys = match key.keys() {
Ok(subkeys) => subkeys, 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; return;
} }
Err(err) => { Err(err) => {
@ -281,7 +291,9 @@ pub fn remove_orphan_registry_entries(installations: &[ManagedPythonInstallation
let python_entry = format!("{astral_key}\\{subkey}"); let python_entry = format!("{astral_key}\\{subkey}");
debug!("Removing orphan registry key HKCU:\\{}", python_entry); debug!("Removing orphan registry key HKCU:\\{}", python_entry);
if let Err(err) = CURRENT_USER.remove_tree(&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; continue;
} }
// TODO(konsti): We don't have an installation key here. // TODO(konsti): We don't have an installation key here.