p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target_files_diff: Fix the issue with file type change. 

When a file is switched from a regular file to a symlink, we should skip
the comparasion.

Bug: 28373409
Change-Id: I8fef00ab9f2d6f811fde1cadf595e8bd46af2dfd
(cherry picked from commit f31a6deeee)
This commit is contained in:
Tao Bao 2016-04-25 10:03:38 -07:00
parent 9d868c0800
commit 00dbe29173
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/releasetools/target_files_diff.py
View File

@ -168,17 +168,16 @@ def recursiveDiff(prefix, dir1, dir2, out_file):
continue
if entry in list2:
if os.path.islink(name1):
if os.path.islink(name2):
link1 = os.readlink(name1)
link2 = os.readlink(name2)
if link1 != link2:
print("%s: Symlinks differ: %s vs %s" % (name, link1, link2),
file=out_file)
else:
print("%s: File types differ, skipping compare" % name,
if os.path.islink(name1) and os.path.islink(name2):
link1 = os.readlink(name1)
link2 = os.readlink(name2)
if link1 != link2:
print("%s: Symlinks differ: %s vs %s" % (name, link1, link2),
file=out_file)
continue
elif os.path.islink(name1) or os.path.islink(name2):
print("%s: File types differ, skipping compare" % name, file=out_file)
continue
stat1 = os.stat(name1)
stat2 = os.stat(name2)