StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e44fadeb: Bug in Mac build where it gets confused over case, fix no longer needed.

Browse Source 
Merge commit 'e44fadeb49aac9d762f089ee2f23e4a4907a822f' into eclair-plus-aosp

* commit 'e44fadeb49aac9d762f089ee2f23e4a4907a822f':
  Bug in Mac build where it gets confused over case, fix no longer needed.
This commit is contained in:
Mike Ritter
2009-09-15 13:45:42 -07:00
committed by Android Git Automerger
parent f1436ccdea e44fadeb49
commit 31d002062e
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/releasetools/img_from_target_files
View File

@@ -31,6 +31,7 @@ if sys.hexversion < 0x02040000:
print >> sys.stderr, "Python 2.4 or newer is required." print >> sys.stderr, "Python 2.4 or newer is required."
sys.exit(1) sys.exit(1)
import errno
import os import os
import re import re
import shutil import shutil
@@ -82,8 +83,16 @@ def AddSystem(output_zip):
# The name of the directory it is making an image out of matters to # The name of the directory it is making an image out of matters to
# mkyaffs2image. It wants "system" but we have a directory named # mkyaffs2image. It wants "system" but we have a directory named
# "SYSTEM", so create a symlink. # "SYSTEM", so create a symlink.
os.symlink(os.path.join(OPTIONS.input_tmp, "SYSTEM"), try:
os.path.join(OPTIONS.input_tmp, "system")) 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", p = common.Run(["mkyaffs2image", "-f",
os.path.join(OPTIONS.input_tmp, "system"), img.name]) os.path.join(OPTIONS.input_tmp, "system"), img.name])