Merge lp:~mwasilew/linaro-android-build-tools/check-file-exists into lp:linaro-android-build-tools

[Milosz Wasilewski]

Fix for bug https://bugs.launchpad.net/linaro-android/+bug/987602

[Milo Casagrande (milo)]

Hello Milosz,

apologies for the delay.
The changes look good, were you also able to test them?

review: Approve

[Milosz Wasilewski (mwasilew)]

> Hello Milosz,
>
> apologies for the delay.
> The changes look good, were you also able to test them?

I briefly tested on an existing script before posting merge request.

=== modified file 'build-scripts/create-user-build-script'
--- build-scripts/create-user-build-script	2013-05-28 08:47:33 +0000
+++ build-scripts/create-user-build-script	2013-06-10 11:51:38 +0000
@@ -121,12 +121,14 @@
 EOF
 	if [ -n "$SOURCE_OVERLAY" ]; then
 		cat <<EOF
-if [ "a\$MANIFEST" == "a" -a \$EXACT -eq 1 ]; then
-	echo "ERROR: no pinned manifest provided. Please download from $PINNED_MANIFEST_URL. This must be done from a browser that accepts cookies."
-	exit 1
+if [ \$EXACT -eq 1 ]; then
+	if [ "a\$MANIFEST" == "a" -o ! -f \$MANIFEST ]; then
+		echo "ERROR: no pinned manifest provided. Please download from $PINNED_MANIFEST_URL. This must be done from a browser that accepts cookies."
+		exit 1
+	fi
 fi
 if [ \$SOURCE_OVERLAY_OPTIONAL -ne 1 ]; then
-	if [ "a\$SOURCE_OVERLAY" == "a" ]; then
+	if [ "a\$SOURCE_OVERLAY" == "a" -o ! -f \$SOURCE_OVERLAY ]; then
 		echo "ERROR: no source overlay provided. Please download from http://snapshots.linaro.org/android/binaries/$SOURCE_OVERLAY. This must be done from a browser that accepts cookies."
 		exit 1
 	fi