October 2012 - Wine-commits

Christian Costa : d3drm: Init vertices before creating group.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: 43d3ba36a1c31ffa8f365eaadcccfd727f8a6020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d3ba36a1c31ffa8f365eaad… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Oct 31 09:56:07 2012 +0100 d3drm: Init vertices before creating group. --- dlls/d3drm/meshbuilder.c | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 87ff35c..c28cefd 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2081,6 +2081,18 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil unsigned* out_ptr; DWORD* in_ptr = This->pFaceData; int i, j; + D3DRMVERTEX* vertices; + + vertices = HeapAlloc(GetProcessHeap(), 0, This->nb_vertices * sizeof(D3DRMVERTEX)); + if (!vertices) + { + IDirect3DRMMesh_Release(*mesh); + return E_OUTOFMEMORY; + } + for (i = 0; i < This->nb_vertices; i++) + vertices[i].position = This->pVertices[i]; + hr = IDirect3DRMMesh_SetVertices(*mesh, 0, 0, This->nb_vertices, vertices); + HeapFree(GetProcessHeap(), 0, vertices); face_data = HeapAlloc(GetProcessHeap(), 0, This->face_data_size * sizeof(DWORD)); if (!face_data) @@ -2121,25 +2133,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil hr = IDirect3DRMMesh_AddGroup(*mesh, This->nb_vertices, This->nb_faces, vertex_per_face, face_data, &group); HeapFree(GetProcessHeap(), 0, face_data); - if (SUCCEEDED(hr)) - { - D3DRMVERTEX* vertices; - vertices = HeapAlloc(GetProcessHeap(), 0, This->nb_vertices * sizeof(D3DRMVERTEX)); - if (vertices) - { - for (i = 0; i < This->nb_vertices; i++) - { - vertices[i].position = This->pVertices[i]; - } - hr = IDirect3DRMMesh_SetVertices(*mesh, 0, 0, This->nb_vertices, vertices); - HeapFree(GetProcessHeap(), 0, vertices); - } - else - { - hr = E_OUTOFMEMORY; - } - } if (SUCCEEDED(hr)) hr = IDirect3DRMMesh_SetGroupColor(*mesh, 0, This->color); if (SUCCEEDED(hr))

1 0

Christian Costa : d3drm: Move mesh builder data cleaning code into a separate function.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: de690b8dae171ceb893f1a0873fb59a6670be14d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de690b8dae171ceb893f1a087… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Oct 31 09:56:15 2012 +0100 d3drm: Move mesh builder data cleaning code into a separate function. --- dlls/d3drm/meshbuilder.c | 59 +++++++++++++++++---------------------------- 1 files changed, 22 insertions(+), 37 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c28cefd..9d3e67a 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -314,6 +314,25 @@ static inline IDirect3DRMMeshBuilderImpl *impl_from_IDirect3DRMMeshBuilder3(IDir return CONTAINING_RECORD(iface, IDirect3DRMMeshBuilderImpl, IDirect3DRMMeshBuilder3_iface); } +static void clean_mesh_builder_data(IDirect3DRMMeshBuilderImpl *mesh_builder) +{ + HeapFree(GetProcessHeap(), 0, mesh_builder->name); + mesh_builder->name = NULL; + HeapFree(GetProcessHeap(), 0, mesh_builder->pVertices); + mesh_builder->pVertices = NULL; + mesh_builder->nb_vertices = 0; + HeapFree(GetProcessHeap(), 0, mesh_builder->pNormals); + mesh_builder->pNormals = NULL; + mesh_builder->nb_normals = 0; + HeapFree(GetProcessHeap(), 0, mesh_builder->pFaceData); + mesh_builder->pFaceData = NULL; + mesh_builder->face_data_size = 0; + mesh_builder->nb_faces = 0; + HeapFree(GetProcessHeap(), 0, mesh_builder->pCoords2d); + mesh_builder->pCoords2d = NULL; + mesh_builder->nb_coords2d = 0; +} + /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_QueryInterface(IDirect3DRMMeshBuilder2* iface, REFIID riid, void** ppvObject) @@ -363,15 +382,11 @@ static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* if (!ref) { + clean_mesh_builder_data(This); if (This->material) IDirect3DRMMaterial2_Release(This->material); if (This->texture) IDirect3DRMTexture3_Release(This->texture); - HeapFree(GetProcessHeap(), 0, This->name); - HeapFree(GetProcessHeap(), 0, This->pVertices); - HeapFree(GetProcessHeap(), 0, This->pNormals); - HeapFree(GetProcessHeap(), 0, This->pFaceData); - HeapFree(GetProcessHeap(), 0, This->pCoords2d); HeapFree(GetProcessHeap(), 0, This); } @@ -1114,9 +1129,6 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) TRACE("(%p)->(%p)\n", This, pData); - /* Remove previous name */ - HeapFree(GetProcessHeap(), 0, This->name); - This->name = NULL; hr = IDirectXFileData_GetName(pData, NULL, &size); if (hr != DXFILE_OK) return hr; @@ -1128,11 +1140,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) hr = IDirectXFileData_GetName(pData, This->name, &size); if (hr != DXFILE_OK) - { - HeapFree(GetProcessHeap(), 0, This->name); - This->name = NULL; return hr; - } } TRACE("Mesh name is '%s'\n", This->name ? This->name : ""); @@ -1518,15 +1526,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* TRACE("(%p)->(%p,%p,%x,%p,%p)\n", This, filename, name, loadflags, cb, arg); - /* First free allocated buffers of previous mesh data */ - HeapFree(GetProcessHeap(), 0, This->pVertices); - This->pVertices = NULL; - HeapFree(GetProcessHeap(), 0, This->pNormals); - This->pNormals = NULL; - HeapFree(GetProcessHeap(), 0, This->pFaceData); - This->pFaceData = NULL; - HeapFree(GetProcessHeap(), 0, This->pCoords2d); - This->pCoords2d = NULL; + clean_mesh_builder_data(This); if (loadflags == D3DRMLOAD_FROMMEMORY) { @@ -1622,22 +1622,7 @@ end: IDirectXFile_Release(pDXFile); if (ret != D3DRM_OK) - { - /* Clean mesh data */ - This->nb_vertices = 0; - This->nb_normals = 0; - This->nb_faces = 0; - This->face_data_size = 0; - This->nb_coords2d = 0; - HeapFree(GetProcessHeap(), 0, This->pVertices); - This->pVertices = NULL; - HeapFree(GetProcessHeap(), 0, This->pNormals); - This->pNormals = NULL; - HeapFree(GetProcessHeap(), 0, This->pFaceData); - This->pFaceData = NULL; - HeapFree(GetProcessHeap(), 0, This->pCoords2d); - This->pCoords2d = NULL; - } + clean_mesh_builder_data(This); return ret; }

1 0

Jacek Caban : urlmon.idl: Added AsyncInstallDistributionUnit declaration.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: a19fb6086bb57fc85c69182938e9c72cd9e24824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19fb6086bb57fc85c6918293… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 31 13:02:43 2012 +0100 urlmon.idl: Added AsyncInstallDistributionUnit declaration. --- include/urlmon.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 85444f9..53e803e 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -2096,6 +2096,7 @@ cpp_quote("HRESULT WINAPI CoInternetIsFeatureEnabled(INTERNETFEATURELIST,DWORD d cpp_quote("HRESULT WINAPI CoInternetIsFeatureEnabledForUrl(INTERNETFEATURELIST,DWORD,LPCWSTR,IInternetSecurityManager*);") cpp_quote("HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR,LPWSTR*,PSUACTION,DWORD);") cpp_quote("HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri*,IUri**,PSUACTION,DWORD_PTR);") +cpp_quote("HRESULT WINAPI AsyncInstallDistributionUnit(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD,LPCWSTR,IBindCtx*,LPVOID,DWORD);") cpp_quote("HRESULT WINAPI CreateFormatEnumerator(UINT,FORMATETC*,IEnumFORMATETC**);") cpp_quote("HRESULT WINAPI GetSoftwareUpdateInfo( LPCWSTR szDistUnit, LPSOFTDISTINFO psdi);") cpp_quote("HRESULT WINAPI FaultInIEFeature(HWND,uCLSSPEC*,QUERYCONTEXT*,DWORD);")

1 0

Francois Gouget : testbot/bin: Fix the fatal error handling in WineRun{Build, Reconfig}.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: tools Branch: master Commit: 0b786aab5fd2e3962da71c6182dd1b446699f20a URL: http://source.winehq.org/git/tools.git/?a=commit;h=0b786aab5fd2e3962da71c61… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:46:36 2012 +0100 testbot/bin: Fix the fatal error handling in WineRun{Build,Reconfig}. Don't call TaskComplete() if we don't have a valid task to start with. A failed task should have an error report file so create it first. --- testbot/bin/WineRunBuild.pl | 21 ++++++++++----------- testbot/bin/WineRunReconfig.pl | 21 ++++++++++----------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index cc0746f..e886801 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -45,6 +45,15 @@ sub FatalError my $TaskKey = defined($Task) ? $Task->GetKey() : "0"; LogMsg "$JobKey/$StepKey/$TaskKey $ErrMessage"; + if ($RptFileName) + { + my $RPTFILE; + if (open RPTFILE, ">>$RptFileName") + { + print RPTFILE $ErrMessage; + close RPTFILE; + } + } if ($Task) { @@ -55,20 +64,10 @@ sub FatalError $Task->VM->Status('dirty'); $Task->VM->Save(); - } - if ($RptFileName) - { - my $RPTFILE; - if (open RPTFILE, ">>$RptFileName") - { - print RPTFILE $ErrMessage; - close RPTFILE; - } + TaskComplete($JobKey, $StepKey, $TaskKey); } - TaskComplete($JobKey, $StepKey, $TaskKey); - exit 1; } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 9cc1e5e..c4d5c49 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -45,6 +45,15 @@ sub FatalError my $TaskKey = defined($Task) ? $Task->GetKey() : "0"; LogMsg "$JobKey/$StepKey/$TaskKey $ErrMessage"; + if ($RptFileName) + { + my $RPTFILE; + if (open RPTFILE, ">>$RptFileName") + { + print RPTFILE $ErrMessage; + close RPTFILE; + } + } if ($Task) { @@ -55,20 +64,10 @@ sub FatalError $Task->VM->Status('dirty'); $Task->VM->Save(); - } - if ($RptFileName) - { - my $RPTFILE; - if (open RPTFILE, ">>$RptFileName") - { - print RPTFILE $ErrMessage; - close RPTFILE; - } + TaskComplete($JobKey, $StepKey, $TaskKey); } - TaskComplete($JobKey, $StepKey, $TaskKey); - exit 1; }

1 0

Francois Gouget : testbot/web: Remove the shebang line and add a copyright notice.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: tools Branch: master Commit: 69cb138b894d48156f9a7b1033270feee3fb5a54 URL: http://source.winehq.org/git/tools.git/?a=commit;h=69cb138b894d48156f9a7b10… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:46:45 2012 +0100 testbot/web: Remove the shebang line and add a copyright notice. The shebang line is useless for web pages and only causes Apache to generate a warning. --- testbot/web/GetFile.pl | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index 1590902..697bbbd 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -1,4 +1,20 @@ -#!/usr/bin/perl -Tw +# Returns the specified Step/Task file. +# +# Copyright 2009 Ge van Geldorp +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA use strict;

1 0

Francois Gouget : testbot/bin: Remove unneeded StepsTasks imports.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: tools Branch: master Commit: 360d290b8a50a6a09f36b7f5eebf8d25256f85f1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=360d290b8a50a6a09f36b7f5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:46:59 2012 +0100 testbot/bin: Remove unneeded StepsTasks imports. --- testbot/bin/WineRunBuild.pl | 1 - testbot/bin/WineRunReconfig.pl | 1 - testbot/bin/WineRunTask.pl | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index e886801..65da630 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -33,7 +33,6 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Log; -use WineTestBot::StepsTasks; use WineTestBot::Engine::Notify; sub FatalError diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c4d5c49..ba03fbd 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -33,7 +33,6 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Log; -use WineTestBot::StepsTasks; use WineTestBot::Engine::Notify; sub FatalError diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 9ec499f..edcfd81 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -33,7 +33,6 @@ use POSIX qw(:fcntl_h); use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Log; -use WineTestBot::StepsTasks; use WineTestBot::Engine::Notify; sub FatalError

1 0

Francois Gouget : testbot/WineRunTask: Just die when killed.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: tools Branch: master Commit: 1f15aa170d4dc112db076c082c19d39472d86ecd URL: http://source.winehq.org/git/tools.git/?a=commit;h=1f15aa170d4dc112db076c08… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:47:05 2012 +0100 testbot/WineRunTask: Just die when killed. This script had a SIGTERM handler that tried to retrieve the task's log file. However this caused a deadlock because testagentd is single-client and WineRunTask still had another connection to it. Anyway, this last ditch attempt to retrieve the log was questionable to begin with. --- testbot/bin/WineRunTask.pl | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index edcfd81..aedfed1 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -228,16 +228,7 @@ my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; my $FullScreenshotFileName = "$TaskDir/screenshot.png"; -sub TermHandler -{ - RetrieveLogFile $Job, $Step, $Task, "C:\\winetest\\$RptFileName", - $FullLogFileName; - TakeScreenshot $VM, $FullScreenshotFileName; - FatalError "Cancelled\n", $FullErrFileName, $Job, $Step, $Task; -} - $VM->Status('running'); -$SIG{TERM} = \&TermHandler; my ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) {

1 0

Francois Gouget : testbot: Cleanup uses of GetKeys(), GetItem(), GetKey() and CreateCollection().
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: tools Branch: master Commit: 403fbbff4d62226b0c27eae84c348d51b2560594 URL: http://source.winehq.org/git/tools.git/?a=commit;h=403fbbff4d62226b0c27eae8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:47:17 2012 +0100 testbot: Cleanup uses of GetKeys(), GetItem(), GetKey() and CreateCollection(). Specifically: - Use GetItems() instead of GetKeys() where appropriate. This way the code is simpler and we avoid one call to GetItem() for each iteration. - Don't call GetKey() when we already have the object's key in a variable. - Don't store the result of CreateCollection() in a variable if we are only going to use it once. --- testbot/bin/CheckForWinetestUpdate.pl | 11 +++----- testbot/bin/Engine.pl | 17 ++++-------- testbot/bin/Janitor.pl | 38 ++++++++------------------ testbot/bin/RevertVM.pl | 3 +- testbot/bin/WineRunBuild.pl | 10 ++----- testbot/bin/WineRunReconfig.pl | 4 +-- testbot/bin/WineRunTask.pl | 4 +-- testbot/bin/WineSendLog.pl | 3 +- testbot/lib/WineTestBot/Branches.pm | 8 +---- testbot/lib/WineTestBot/CGI/Sessions.pm | 6 +--- testbot/lib/WineTestBot/Jobs.pm | 35 +++++++----------------- testbot/lib/WineTestBot/Patches.pm | 12 +++----- testbot/lib/WineTestBot/PendingPatchSets.pm | 3 +- testbot/lib/WineTestBot/StepsTasks.pm | 8 +---- testbot/lib/WineTestBot/Tasks.pm | 4 +-- testbot/lib/WineTestBot/Users.pm | 6 +--- testbot/lib/WineTestBot/VMs.pm | 9 ++---- testbot/web/JobDetails.pl | 5 +-- testbot/web/Submit.pl | 24 ++++++---------- 19 files changed, 67 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=403fbbff4d62226b0c27…

1 0

Alexandre Julliard : testbot: Load the configuration file from the testbot root directory.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: tools Branch: master Commit: c0b0689be9b714ab27275eabfadfbf0240a0c411 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c0b0689be9b714ab27275eab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 30 17:32:27 2012 +0100 testbot: Load the configuration file from the testbot root directory. --- testbot/lib/WineTestBot/Config.pm | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index aa9f3e2..71cf1c6 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -80,11 +80,11 @@ $JobArchiveDays = 0; if (!$::BuildEnv) { $::BuildEnv = 0; - eval 'require "WineTestBot/ConfigLocal.pl";'; + eval 'require "$::RootDir/ConfigLocal.pl";'; if ($@) { - print STDERR "Please create a valid lib/WineTestBot/ConfigLocal.pl, " . - "use lib/WineTestBot/ConfigLocalTemplate.pl as template\n"; + print STDERR "Please create a valid $::RootDir/ConfigLocal.pl, " . + "use $::RootDir/lib/WineTestBot/ConfigLocalTemplate.pl as template\n"; exit; }

1 0

Francois Gouget : testbot/Janitor: Remove unneeded package qualifiers for the configuration settings.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: tools Branch: master Commit: 4da7fea6937a8d32cbf132e152af20ea750cabe4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4da7fea6937a8d32cbf132e1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:46:11 2012 +0100 testbot/Janitor: Remove unneeded package qualifiers for the configuration settings. --- testbot/bin/Janitor.pl | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 6c398d7..e978aa3 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -42,9 +42,9 @@ $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; # Delete obsolete Jobs -if ($WineTestBot::Config::JobPurgeDays != 0) +if ($JobPurgeDays != 0) { - my $DeleteBefore = time() - $WineTestBot::Config::JobPurgeDays * 86400; + my $DeleteBefore = time() - $JobPurgeDays * 86400; my $Jobs = CreateJobs(); foreach my $JobKey (@{$Jobs->GetKeys()}) { @@ -91,9 +91,9 @@ foreach my $SetKey (@{$Sets->GetKeys()}) } # Delete obsolete Patches now that no Job references them -if ($WineTestBot::Config::JobPurgeDays != 0) +if ($JobPurgeDays != 0) { - $DeleteBefore = time() - $WineTestBot::Config::JobPurgeDays * 86400; + $DeleteBefore = time() - $JobPurgeDays * 86400; my $Patches = CreatePatches(); foreach my $PatchKey (@{$Patches->GetKeys()}) { @@ -118,9 +118,9 @@ if ($WineTestBot::Config::JobPurgeDays != 0) } # Archive old Jobs, that is remove all their associated files -if ($WineTestBot::Config::JobArchiveDays != 0) +if ($JobArchiveDays != 0) { - my $ArchiveBefore = time() - $WineTestBot::Config::JobArchiveDays * 86400; + my $ArchiveBefore = time() - $JobArchiveDays * 86400; my $Jobs = CreateJobs(); $Jobs->FilterNotArchived(); foreach my $JobKey (@{$Jobs->GetKeys()})

1 0