Francois Gouget : testbot/LibvirtTool: Only allow dashes in the locale snapshot names.

Alexandre Julliard julliard at winehq.org
Wed Oct 2 16:49:22 CDT 2019


Module: tools
Branch: master
Commit: ade2cc55a64580bc20ca60ff3ec841c2b0cd1945
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=ade2cc55a64580bc20ca60ff3ec841c2b0cd1945

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Wed Oct  2 07:02:22 2019 +0200

testbot/LibvirtTool: Only allow dashes in the locale snapshot names.

Matching the Windows locale syntax makes it easier to interface with
SetWinLocale.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 testbot/bin/LibvirtTool.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl
index 415cdc5..d590191 100755
--- a/testbot/bin/LibvirtTool.pl
+++ b/testbot/bin/LibvirtTool.pl
@@ -493,7 +493,7 @@ sub Revert()
   my $Domain = $VM->GetDomain();
   if (($VM->Type eq "win32" or $VM->Type eq "win64") and
       !$Domain->HasSnapshot($DomainSnapshot) and
-      $DomainSnapshot =~ s/-([a-z]{2})[_-]([A-Z]{2})$//)
+      $DomainSnapshot =~ s/-([a-z]{2})-([A-Z]{2})$//)
   {
     # Add some extra time to set up the VM locale and reboot it
     $ExtraTimeout += $VMToolTimeout;




More information about the wine-cvs mailing list