- fix dropin default value
authorElan Ruusamäe <glen@pld-linux.org>
Tue, 25 May 2010 09:38:15 +0000 (09:38 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
- use same rev for both arch

Changed files:
    update-source.sh -> 1.14

update-source.sh

index 381d6e55ed0e0e8b47a9f00209a16b2442e18c88..7f7d772257d0a882e77a1f10c57394054042b32d 100644 (file)
@@ -1,17 +1,25 @@
 #!/bin/sh
 set -e
-dropin=0
+dropin=
 
 if [ "$1" ]; then
        rev=$1
        echo "Using $rev..."
 else
-       echo -n "Fetching latest revno... "
+       echo "Fetching latest revno... "
        rev=$(wget -q -O - http://build.chromium.org/buildbot/continuous/linux/LATEST/REVISION)
        rev64=$(wget -q -O - http://build.chromium.org/buildbot/continuous/linux64/LATEST/REVISION)
-       if [ "$rev" != "$rev64" ] && [ $(uname -m) -eq "x86_64" ]; then
-               echo -n >&2 "Current 32bit build ($rev) does not match 64bit build ($rev64). The upstream buildbot probably failed. Usuing latest 64bit revision..."
-               rev=$rev64
+       # be sure that we use same rev on both arch
+       if [ "$rev" != "$rev64" ]; then
+               echo "Current 32bit build ($rev) does not match 64bit build ($rev64)"
+               echo "The upstream buildbot probably failed."
+               if [ "$rev" -lt "$rev64" ]; then
+                       echo "Using latest 32bit revision..."
+                       rev64=$rev
+               else
+                       echo "Using latest 64bit revision..."
+                       rev=$rev64
+               fi
        fi
        echo "$rev"
        # TODO: use release branches instead of trunk. Current release can be looked up like this:
This page took 0.068375 seconds and 4 git commands to generate.