From bc4ebfef2fc02b9d3237a8ecfe74f8fd7ffdcd52 Mon Sep 17 00:00:00 2001 From: Daniel Collins Date: Sun, 3 Nov 2024 16:10:37 +0000 Subject: [PATCH] Use correct syntax to delete registry keys on NT. --- tests/lib/IPXWrapper/Util.pm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/lib/IPXWrapper/Util.pm b/tests/lib/IPXWrapper/Util.pm index a87fc1e..23caf76 100644 --- a/tests/lib/IPXWrapper/Util.pm +++ b/tests/lib/IPXWrapper/Util.pm @@ -155,15 +155,20 @@ sub reg_delete_value { my ($host_ip, $key, $value) = @_; - eval { run_remote_cmd($host_ip, "REG", "QUERY", "$key\\$value"); }; - - unless($@) + if(IPXWrapper::Tool::OSVersion->get($host_ip)->platform_is_winnt()) { - if(IPXWrapper::Tool::OSVersion->get($host_ip)->platform_is_winnt()) + eval { run_remote_cmd($host_ip, "REG", "QUERY", $key, "/v", $value); }; + + unless($@) { run_remote_cmd($host_ip, "REG", "DELETE", $key, "/v", $value, "/f"); } - else{ + } + else{ + eval { run_remote_cmd($host_ip, "REG", "QUERY", "$key\\$value"); }; + + unless($@) + { run_remote_cmd($host_ip, "REG", "DELETE", "$key\\$value", "/FORCE"); } }