From 095bfd224ac913994f90e2eab7e9bdefee0bdb3c Mon Sep 17 00:00:00 2001
From: atlurie <atlurie@uab.edu>
Date: Fri, 20 May 2022 11:35:57 -0500
Subject: [PATCH] Fix improper merge conflict resolution
---
prod_rmq_agents/acct_mgmt_workflow.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/prod_rmq_agents/acct_mgmt_workflow.py b/prod_rmq_agents/acct_mgmt_workflow.py
index 73fa4ee..6d0f6c8 100755
--- a/prod_rmq_agents/acct_mgmt_workflow.py
+++ b/prod_rmq_agents/acct_mgmt_workflow.py
@@ -32,7 +32,7 @@ def manage_acct(ch, method, properties, body):
current = tracking[username] = {}
if op == 'request':
- if state == 'blocked' or state == 'certification':
+ if state == 'hold' or state == 'certification':
msg["action"] = "lock"
elif state == 'ok':
msg["action"] = "unlock"
--
GitLab