From 5548097215dbbf5d844e2c623e01410bc868b0f3 Mon Sep 17 00:00:00 2001
From: SKAJohanVenter <aventer@ska.ac.za>
Date: Wed, 27 Oct 2021 08:40:09 +0200
Subject: [PATCH] SAR-288 Resolved merge conflict
---
src/ska_tango_base/base/task_queue_manager.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/ska_tango_base/base/task_queue_manager.py b/src/ska_tango_base/base/task_queue_manager.py
index 5ce0a59e..dc4a3849 100644
--- a/src/ska_tango_base/base/task_queue_manager.py
+++ b/src/ska_tango_base/base/task_queue_manager.py
@@ -381,16 +381,12 @@ class QueueManager:
"""
try:
if hasattr(task, "is_allowed"):
-<<<<<<< HEAD:src/ska_tango_base/base/task_queue_manager.py
- if not task.is_allowed():
-=======
is_allowed_signature = signature(task.is_allowed)
if "raise_if_disallowed" in is_allowed_signature.parameters:
is_task_allowed = task.is_allowed(raise_if_disallowed=True)
else:
is_task_allowed = task.is_allowed()
if not is_task_allowed:
->>>>>>> main:src/ska_tango_base/base/task_queue_component_manager.py
return TaskResult(
ResultCode.NOT_ALLOWED, "Command not allowed", unique_id
)
--
GitLab