Francois Gouget : testbot/PatchUtils: Take into account module subdirectories.
Alexandre Julliard
julliard at winehq.org
Tue Apr 6 15:28:59 CDT 2021
Module: tools
Branch: master
Commit: 2377f26807488984a76c702af779a4f58ee23f42
URL: https://source.winehq.org/git/tools.git/?a=commit;h=2377f26807488984a76c702af779a4f58ee23f42
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Tue Apr 6 11:23:24 2021 +0200
testbot/PatchUtils: Take into account module subdirectories.
Patches to files in in a subdirectory of a dll or program should be
treated the same as regular dll/program patches.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/lib/WineTestBot/PatchUtils.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm
index 0d60fdb..7ae58d3 100644
--- a/testbot/lib/WineTestBot/PatchUtils.pm
+++ b/testbot/lib/WineTestBot/PatchUtils.pm
@@ -240,7 +240,7 @@ sub _HandleFile($$$)
$Impacts->{MakeMakefiles} = 1;
}
}
- elsif ($FilePath =~ m~^(dlls|programs)/([^/]+)/([^/\s]+)$~)
+ elsif ($FilePath =~ m~^(dlls|programs)/([^/\s]+)/((?:[^\s]+/)?[^/\s]+)$~)
{
my ($Root, $PatchedDir, $File) = ($1, $2, $3);
More information about the wine-cvs
mailing list