packages: chromium-browser-bin/update-source.sh - fix dropin default value ...

[glen]

Author: glen                         Date: Tue May 25 09:38:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix dropin default value
- use same rev for both arch

---- Files affected:
packages/chromium-browser-bin:
   update-source.sh (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/chromium-browser-bin/update-source.sh
diff -u packages/chromium-browser-bin/update-source.sh:1.13 packages/chromium-browser-bin/update-source.sh:1.14
--- packages/chromium-browser-bin/update-source.sh:1.13	Sat Apr 24 15:36:59 2010
+++ packages/chromium-browser-bin/update-source.sh	Tue May 25 11:38:15 2010
@@ -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:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser-bin/update-source.sh?r1=1.13&r2=1.14&f=u