Skip to content

Commit 75ab763

Browse files
committed
Fix windows install detection
1 parent bfae0b8 commit 75ab763

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

gpgme-sys/build.rs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,22 @@ fn try_registry() -> bool {
2222
}
2323

2424
let hklm = RegKey::predef(HKEY_LOCAL_MACHINE);
25-
let Ok(key) = hklm.open_subkey_with_flags(r"SOFTWARE\GnuPG", KEY_WOW64_32KEY) else {
26-
eprintln!("unable to retrieve install location");
27-
return false;
25+
let key = match hklm.open_subkey_with_flags(r"SOFTWARE\GnuPG", KEY_WOW64_32KEY | KEY_READ) {
26+
Ok(x) => x,
27+
Err(e) => {
28+
eprintln!("Unable to retrieve install location: {e}");
29+
return false;
30+
}
2831
};
29-
let Ok(root) = key
32+
let root = match key
3033
.get_value::<OsString, _>("Install Directory")
3134
.map(PathBuf::from)
32-
else {
33-
eprintln!("unable to retrieve install location");
34-
return false;
35+
{
36+
Ok(x) => x,
37+
Err(e) => {
38+
eprintln!("Unable to retrieve install location: {e}");
39+
return false;
40+
}
3541
};
3642
println!("detected install via registry: {}", root.display());
3743

@@ -40,7 +46,7 @@ fn try_registry() -> bool {
4046
root.join("lib/libgpgme.imp"),
4147
build::out_dir().join("libgpgme.a"),
4248
) {
43-
eprintln!("unable to rename library: {e}");
49+
eprintln!("Unable to rename library: {e}");
4450
return false;
4551
}
4652
}

0 commit comments

Comments
 (0)