From 239e9f2671eb641304716342e7188fb2a48fd462 Mon Sep 17 00:00:00 2001 From: Mike Ritter Date: Wed, 30 Sep 2009 12:09:19 -0700 Subject: [PATCH] Bug in Mac build where it gets confused over case, fix no longer needed. (cherry picked from commit e44fadeb49aac9d762f089ee2f23e4a4907a822f) --- tools/releasetools/img_from_target_files | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/releasetools/img_from_target_files b/tools/releasetools/img_from_target_files index 00abde47d..d157dca3f 100755 --- a/tools/releasetools/img_from_target_files +++ b/tools/releasetools/img_from_target_files @@ -31,6 +31,7 @@ if sys.hexversion < 0x02040000: print >> sys.stderr, "Python 2.4 or newer is required." sys.exit(1) +import errno import os import re import shutil @@ -82,8 +83,16 @@ def AddSystem(output_zip): # The name of the directory it is making an image out of matters to # mkyaffs2image. It wants "system" but we have a directory named # "SYSTEM", so create a symlink. - os.symlink(os.path.join(OPTIONS.input_tmp, "SYSTEM"), - os.path.join(OPTIONS.input_tmp, "system")) + try: + os.symlink(os.path.join(OPTIONS.input_tmp, "SYSTEM"), + os.path.join(OPTIONS.input_tmp, "system")) + except OSError, e: + # bogus error on my mac version? + # File "./build/tools/releasetools/img_from_target_files", line 86, in AddSystem + # os.path.join(OPTIONS.input_tmp, "system")) + # OSError: [Errno 17] File exists + if (e.errno == errno.EEXIST): + pass p = common.Run(["mkyaffs2image", "-f", os.path.join(OPTIONS.input_tmp, "system"), img.name])