[CalendarServer-changes] [15679] CalendarServer/trunk/calendarserver/tap/util.py

source_changes at macosforge.org source_changes at macosforge.org
Thu Jun 16 17:26:21 PDT 2016


Revision: 15679
          http://trac.calendarserver.org//changeset/15679
Author:   dre at apple.com
Date:     2016-06-16 17:26:21 -0700 (Thu, 16 Jun 2016)
Log Message:
-----------
Correctly check exit status of openssl command used to check APNS cert validity

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/util.py

Modified: CalendarServer/trunk/calendarserver/tap/util.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/util.py	2016-06-16 20:34:40 UTC (rev 15678)
+++ CalendarServer/trunk/calendarserver/tap/util.py	2016-06-17 00:26:21 UTC (rev 15679)
@@ -1451,7 +1451,8 @@
         args = [opensslTool, "x509", "-checkend", "0", "-noout", "-in", certPath]
         child = Popen(args=args, stdout=PIPE, stderr=PIPE)
         output, error = child.communicate()
-        return error == 0
+        exitStatus = child.returncode
+        return exitStatus == 0
     except IndexError:
         # We can't check
         return True
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160616/a9f4f285/attachment.html>


More information about the calendarserver-changes mailing list