From 8e6abb04c6e8b070860928afa67c9ad2376a225e Mon Sep 17 00:00:00 2001
From: Trevor Bourget <tbourget@codeaurora.org>
Date: Mon, 13 Dec 2010 09:44:32 -0700
Subject: [PATCH] scripts: repair build_image nostatefuldev collision

Change-Id: Ib9fcc078d8e0223cd1b1376db91d8e71ae8359a6

BUG=cp file to itself fails in case of nostatefuldev
TEST=ran build_image with and without statefuldev

Review URL: http://codereview.chromium.org/4959001
Patch from Trevor Bourget <tbourget@codeaurora.org>.
---
 build_image | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build_image b/build_image
index 722d704f96..9e4df1229f 100755
--- a/build_image
+++ b/build_image
@@ -415,7 +415,8 @@ update_dev_packages() {
   fi
 
   # Install the bare necessary files so that the "emerge" command works
-  sudo cp ${root_dev_dir}/etc/make.globals ${ROOT_FS_DIR}/etc/
+  [ ${FLAGS_statefuldev} -eq ${FLAGS_TRUE} ] && \
+    sudo cp ${root_dev_dir}/etc/make.globals ${ROOT_FS_DIR}/etc/
   sudo sed -i s,/usr/bin/wget,wget, ${ROOT_FS_DIR}/etc/make.globals
   sudo mkdir -p ${ROOT_FS_DIR}/etc/make.profile