Francois Gouget : testbot/PatchUtils: Fix handling of renames.

Alexandre Julliard julliard at winehq.org
Fri Mar 12 14:28:32 CST 2021


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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Mar 11 14:01:43 2021 +0100

testbot/PatchUtils: Fix handling of renames.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50719
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 testbot/lib/WineTestBot/PatchUtils.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm
index 37b1b77..796457a 100644
--- a/testbot/lib/WineTestBot/PatchUtils.pm
+++ b/testbot/lib/WineTestBot/PatchUtils.pm
@@ -389,7 +389,9 @@ sub GetPatchImpacts($)
     }
     elsif ($Line =~ m~^\+\+\+ \w+/([^\s]+)$~)
     {
-      _HandleFile($Impacts, $1, $Change || "modify");
+      my $PlusPath = $1;
+      _HandleFile($Impacts, $Path, "rm") if (defined $Path and $Path ne $PlusPath);
+      _HandleFile($Impacts, $PlusPath, $Change || "modify");
       $Path = undef;
       $Change = "";
     }




More information about the wine-cvs mailing list