[PATCH] testbot: The locale modifier must come after the codeset.

Francois Gouget fgouget at codeweavers.com
Fri Nov 23 09:22:09 CST 2018


This fixes SetupWineEnvironment() so it adds the default '.UTF-8' in the
right place.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
 testbot/lib/Build/Utils.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm
index 4dda8d51fc..0f1ddb0f00 100644
--- a/testbot/lib/Build/Utils.pm
+++ b/testbot/lib/Build/Utils.pm
@@ -337,7 +337,7 @@ sub SetupWineEnvironment($)
   my $Lang = $Mission->{lang} || "en_US";
   if ($Lang =~ /^[a-zA-Z0-9\@_.-]+$/)
   {
-    $Lang .= ".UTF-8" if ($Lang !~ /\./);
+    $Lang =~ s/(@[a-z]*$|$)/.UTF-8$1/ if ($Lang !~ /\./);
     $ENV{LANG} = $Lang;
   }
 
-- 
2.19.1




More information about the wine-devel mailing list