backend/server/rhnServer/server_token.py | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 46647b316f5c8d3b06cd35de0f442286899261be
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 21 10:12:01 2010 +0100
526696 - checking whether server already uses a token
if so, token doesn't consume extra usage slot
diff --git a/backend/server/rhnServer/server_token.py
b/backend/server/rhnServer/server_token.py
index dcd691a..755e1c8 100644
--- a/backend/server/rhnServer/server_token.py
+++ b/backend/server/rhnServer/server_token.py
@@ -460,11 +460,19 @@ _query_server_token_used = rhnSQL.Statement("""
values (:server_id, :token_id)
""")
+_query_check_server_uses_token = rhnSQL.Statement("""
+ select 1 from rhnServerTokenRegs
+ where server_id = :server_id
+ and token_id = :token_id
+""")
+
def server_used_token(server_id, token_id):
- h = rhnSQL.prepare(_query_server_token_used)
+ h = rhnSQL.prepare(_query_check_server_uses_token)
h.execute(server_id=server_id, token_id=token_id)
-
-
+ ret = h.fetchone_dict()
+ if not ret:
+ h = rhnSQL.prepare(_query_server_token_used)
+ h.execute(server_id=server_id, token_id=token_id)
_query_check_token_limits = rhnSQL.Statement("""
select
Show replies by date