Changeset 1815 for trunk/prepare_new_stable

Timestamp:

Nov 4, 2010 12:51:15 PM (10 years ago)

Author:

lou

Message:

Back merge stable/0.6 r1813:1814 into trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• prepare_new_stable (modified) (1 diff)

trunk/prepare_new_stable

@@ -674 +674 @@
         ext_minVer=`expr $ext_minVer + 1`
         ext_url=`replaceVersionInURL $ext_url $ext_majVer $ext_minVer`
-        # pre-1.1 Data configuration
-        if ! expr "$ext_url" : '.*/Data/trunk/.*' >/dev/null 2>&1 ; then
+        ext_isNormal=`isNormalURL $ext_url`
+        if test $ext_isNormal = yes ; then
           ext_url="${ext_url}${ext_proj}"
         fi