[CalendarServer-changes] [11312] CalendarServer/trunk/support/py.sh

[source_changes at macosforge.org]

Revision: 11312
          http://trac.calendarserver.org//changeset/11312
Author:   wsanchez at apple.com
Date:     2013-06-05 17:17:37 -0700 (Wed, 05 Jun 2013)
Log Message:
-----------
Avoid `set -e` trouble.

Modified Paths:
--------------
    CalendarServer/trunk/support/py.sh

Modified: CalendarServer/trunk/support/py.sh
===================================================================
--- CalendarServer/trunk/support/py.sh	2013-06-05 23:28:11 UTC (rev 11311)
+++ CalendarServer/trunk/support/py.sh	2013-06-06 00:17:37 UTC (rev 11312)
@@ -86,10 +86,13 @@
 
   local module="$1"; shift;
 
-  "${python}" -c "import ${module}" > /dev/null 2>&1;
-  result=$?;
+  if "${python}" -c "import ${module}" > /dev/null 2>&1; then
+    result=0;
+  else
+    result=1;
+  fi;
 
-  if [ $result == 0 ] && [ -n "${version}" ]; then
+  if [ ${result} == 0 ] && [ -n "${version}" ]; then
     for symbol in "xxxx" "__version__" "version"; do
       if module_version="$(
         "${python}" -c \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130605/a258afd7/attachment.html>