Module: tools Branch: master Commit: 09b3464029ecccf474171e4f6bb884723dd64597 URL: https://source.winehq.org/git/tools.git/?a=commit;h=09b3464029ecccf474171e4f...
Author: Francois Gouget fgouget@codeweavers.com Date: Wed Jul 11 11:35:02 2018 +0200
testbot: Remove support for the old Step files locations.
It is no longer needed now that all the existing Jobs follow the new conventions.
Signed-off-by: Francois Gouget fgouget@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
testbot/lib/WineTestBot/Steps.pm | 5 ----- testbot/lib/WineTestBot/StepsTasks.pm | 5 ----- 2 files changed, 10 deletions(-)
diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 9a4ada9..cb2c6ee 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -153,11 +153,6 @@ sub GetFullFileName($) return undef if (!defined $self->FileName);
my ($JobId, $StepNo) = @{$self->GetMasterKey()}; - # FIXME: Remove legacy support once no such job remains (so after - # $JobPurgeDays). - my $LegacyPath = "$DataDir/jobs/$JobId/$StepNo/" . $self->FileName; - return $LegacyPath if (-f $LegacyPath); - my $Path = "$DataDir/jobs/$JobId/"; $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); return $Path . $self->FileName; diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index e10cd8c..4675194 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -47,11 +47,6 @@ sub GetFullFileName($) return undef if (!defined $self->FileName);
my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; - # FIXME: Remove legacy support once no such job remains (so after - # $JobPurgeDays). - my $LegacyPath = "$DataDir/jobs/$JobId/". $self->StepNo ."/". $self->FileName; - return $LegacyPath if (-f $LegacyPath); - my $Path = "$DataDir/jobs/$JobId/"; $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); return $Path . $self->FileName;