File tree Expand file tree Collapse file tree 1 file changed +14
-8
lines changed Expand file tree Collapse file tree 1 file changed +14
-8
lines changed Original file line number Diff line number Diff line change @@ -22,16 +22,22 @@ fn try_registry() -> bool {
22
22
}
23
23
24
24
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
+ }
28
31
} ;
29
- let Ok ( root) = key
32
+ let root = match key
30
33
. get_value :: < OsString , _ > ( "Install Directory" )
31
34
. 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
+ }
35
41
} ;
36
42
println ! ( "detected install via registry: {}" , root. display( ) ) ;
37
43
@@ -40,7 +46,7 @@ fn try_registry() -> bool {
40
46
root. join ( "lib/libgpgme.imp" ) ,
41
47
build:: out_dir ( ) . join ( "libgpgme.a" ) ,
42
48
) {
43
- eprintln ! ( "unable to rename library: {e}" ) ;
49
+ eprintln ! ( "Unable to rename library: {e}" ) ;
44
50
return false ;
45
51
}
46
52
}
You can’t perform that action at this time.
0 commit comments