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

am a0021026: Merge "fix up ota_from_target_files symlink detection."

Browse Source 
* commit 'a00210263efdce91c8035e34e062c67e8828c4a5':
  fix up ota_from_target_files symlink detection.
This commit is contained in:
Tao Bao
2015-07-07 17:02:47 +00:00
committed by Android Git Automerger
parent 11d4406eb9 a00210263e
commit 1747e35a09
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/ota_from_target_files.py
View File

@@ -136,12 +136,12 @@ def MostPopularKey(d, default):
def IsSymlink(info):
"""Return true if the zipfile.ZipInfo object passed in represents a
symlink."""
return (info.external_attr >> 16) == 0o120777
return (info.external_attr >> 16) & 0o770000 == 0o120000
def IsRegular(info):
"""Return true if the zipfile.ZipInfo object passed in represents a
symlink."""
return (info.external_attr >> 28) == 0o10
regular file."""
return (info.external_attr >> 16) & 0o770000 == 0o100000
def ClosestFileMatch(src, tgtfiles, existing):
"""Returns the closest file match between a source file and list