From c31d11f321d15fabe6163e86e2042407d67d0690 Mon Sep 17 00:00:00 2001 From: Mark Smith Date: Mon, 12 Feb 2024 15:47:29 +0100 Subject: [PATCH] fix job kill --- ganga/GangaDirac/Lib/Server/DiracCommands.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ganga/GangaDirac/Lib/Server/DiracCommands.py b/ganga/GangaDirac/Lib/Server/DiracCommands.py index 65cedf1ed3..c0247ee263 100644 --- a/ganga/GangaDirac/Lib/Server/DiracCommands.py +++ b/ganga/GangaDirac/Lib/Server/DiracCommands.py @@ -10,12 +10,7 @@ def getJobGroupJobs(jg): @diracCommand def kill(id): ''' Kill a given DIRAC Job ID within DIRAC ''' - stat_results = dirac.getJobStatus(id) - stat = stat_results['Value'][id].get('Status', None) - if stat == 'Waiting': - return dirac.deleteJob(id) - else: - return dirac.killJob(id) + return dirac.deleteJob(id) @diracCommand