mod_image_for_test.sh - Issue 6538031: Move check for image until we actually need it.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mod_image_for_test.sh

Issue 6538031: Move check for image until we actually need it. (Closed) Base URL: http://git.chromium.org/git/crosutils.git@master

Patch Set: Created 9 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: mod_image_for_test.sh

diff --git a/mod_image_for_test.sh b/mod_image_for_test.sh

index b9f123fb0aa51536231f72414bacef3d8b18a853..484a898b78b7a75d519a569f7746138101b3b758 100755

--- a/mod_image_for_test.sh

+++ b/mod_image_for_test.sh

@@ -87,12 +87,6 @@ fi

# Turn path into an absolute path.

FLAGS_image=`eval readlink -f ${FLAGS_image}`

-# Abort early if we can't find the image

-if [ ! -f $FLAGS_image ] ; then

- echo "No image found at $FLAGS_image"

- exit 1

-fi

# What cross-build are we targeting?

. "${FLAGS_build_root}/${FLAGS_board}/etc/make.conf.board_setup"

# Figure out ARCH from the given toolchain.

@@ -214,6 +208,12 @@ else

echo "Modifying image ${FLAGS_image} for test..."

+# Abort early if we can't find the image

+if [ ! -f $FLAGS_image ] && [ ${FLAGS_inplace} -eq ${FLAGS_TRUE} ; then

+ echo "No image found at $FLAGS_image to modify"

petkov 2011/02/17 20:00:41 die

+ exit 1

+fi

set -e

IMAGE_DIR=$(dirname "$FLAGS_image")

« no previous file with comments | « no previous file | no next file » | no next file with comments »