tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 0488079d: Merge "Fix the computation of basefilename"

Browse source 
* commit '0488079dfa5d5e53198125934eeaefa9cf1e7047':
  Fix the computation of basefilename
This commit is contained in:
Tao Bao 2015-03-23 23:54:55 +00:00 committed by Android Git Automerger
commit 2d139fcf29
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/releasetools/ota_from_target_files
View file

@ -349,8 +349,9 @@ def CopyPartitionFiles(itemset, input_zip, output_zip=None, substitute=None):
partition = itemset.partition
for info in input_zip.infolist():
if info.filename.startswith(partition.upper() + "/"):
basefilename = info.filename[7:]
prefix = partition.upper() + "/"
if info.filename.startswith(prefix):
basefilename = info.filename[len(prefix):]
if IsSymlink(info):
symlinks.append((input_zip.read(info.filename),
"/" + partition + "/" + basefilename))
@ -663,7 +664,7 @@ def LoadPartitionFiles(z, partition):
prefix = partition.upper() + "/"
for info in z.infolist():
if info.filename.startswith(prefix) and not IsSymlink(info):
basefilename = info.filename[7:]
basefilename = info.filename[len(prefix):]
fn = partition + "/" + basefilename
data = z.read(info.filename)
out[fn] = common.File(fn, data)