You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
1.3 KiB
37 lines
1.3 KiB
8 years ago
|
From 952465a544a0243b6112a10bfcfdffb1ad081fab Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dennis Gilmore <dennis@ausil.us>
|
||
|
|
Date: Wed, 19 Apr 2017 14:51:19 -0500
|
||
|
|
Subject: [PATCH] allow kojid to start when not using ssl cert auth
|
||
|
|
|
||
|
|
kojid in koji 1.12.0 fails to start when not using ssl cert auth
|
||
|
|
Traceback (most recent call last):
|
||
|
|
File "/usr/sbin/kojid", line 5627, in <module>
|
||
|
|
if os.path.isfile(options.cert):
|
||
|
|
File "/usr/lib64/python2.7/genericpath.py", line 37, in isfile
|
||
|
|
st = os.stat(path)
|
||
|
|
TypeError: coercing to Unicode: need string or buffer, NoneType found
|
||
|
|
if you do not have a cert option defined we should move on. so add
|
||
|
|
to the if statement a check that the option is actually defined
|
||
|
|
|
||
|
|
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
|
||
|
|
---
|
||
|
|
builder/kojid | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/builder/kojid b/builder/kojid
|
||
|
|
index 6f3837a..dd46d4a 100755
|
||
|
|
--- a/builder/kojid
|
||
|
|
+++ b/builder/kojid
|
||
|
|
@@ -5624,7 +5624,7 @@ if __name__ == "__main__":
|
||
|
|
#start a session and login
|
||
|
|
session_opts = koji.grab_session_options(options)
|
||
|
|
session = koji.ClientSession(options.server, session_opts)
|
||
|
|
- if os.path.isfile(options.cert):
|
||
|
|
+ if options.cert and os.path.isfile(options.cert):
|
||
|
|
try:
|
||
|
|
# authenticate using SSL client certificates
|
||
|
|
session.ssl_login(options.cert, None,
|
||
|
|
--
|
||
|
|
2.12.2
|
||
|
|
|