From 9c3609a0a634d4078e1cd5cfe43d403b0a8c9b57 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 25 May 2010 09:38:15 +0000 Subject: [PATCH] - fix dropin default value - use same rev for both arch Changed files: update-source.sh -> 1.14 --- update-source.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/update-source.sh b/update-source.sh index 381d6e5..7f7d772 100644 --- a/update-source.sh +++ b/update-source.sh @@ -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: -- 2.43.0