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

[source_changes at macosforge.org]

Revision: 7313
          http://trac.macosforge.org/projects/calendarserver/changeset/7313
Author:   wsanchez at apple.com
Date:     2011-04-12 15:08:46 -0700 (Tue, 12 Apr 2011)
Log Message:
-----------
Fix case where cmp_version thinks 11.0.0 < 10.1

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

Modified: CalendarServer/trunk/support/py.sh
===================================================================
--- CalendarServer/trunk/support/py.sh	2011-04-12 17:43:07 UTC (rev 7312)
+++ CalendarServer/trunk/support/py.sh	2011-04-12 22:08:46 UTC (rev 7313)
@@ -120,12 +120,12 @@
 # Compare version numbers
 
 cmp_version () {
-  local result=0;
-
   local  v="$1"; shift;
   local mv="$1"; shift;
 
-  while [ $result != 1 ]; do
+  local result;
+
+  while true; do
      vh="${v%%.*}"; # Get highest-order segment
     mvh="${mv%%.*}";
 
@@ -134,8 +134,14 @@
       break;
     fi;
 
+    if [ "${vh}" -lt "${mvh}" ]; then
+      result=0;
+      break;
+    fi;
+
     if [ "${v}" == "${v#*.}" ]; then
       # No dots left, so we're ok
+      result=0;
       break;
     fi;
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110412/f2f8ae71/attachment.html>