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

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

Browse Source 
* commit '1747e35a090cff66b117128c7bffd2e8b5050f37':
  fix up ota_from_target_files symlink detection.
This commit is contained in:
Tao Bao
2015-07-07 17:18:59 +00:00
committed by Android Git Automerger
parent c607474ec2 1747e35a09
commit e9c462b00a
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): def IsSymlink(info):
"""Return true if the zipfile.ZipInfo object passed in represents a """Return true if the zipfile.ZipInfo object passed in represents a
symlink.""" symlink."""
return (info.external_attr >> 16) == 0o120777 return (info.external_attr >> 16) & 0o770000 == 0o120000
def IsRegular(info): def IsRegular(info):
"""Return true if the zipfile.ZipInfo object passed in represents a """Return true if the zipfile.ZipInfo object passed in represents a
symlink.""" regular file."""
return (info.external_attr >> 28) == 0o10 return (info.external_attr >> 16) & 0o770000 == 0o100000
def ClosestFileMatch(src, tgtfiles, existing): def ClosestFileMatch(src, tgtfiles, existing):
"""Returns the closest file match between a source file and list """Returns the closest file match between a source file and list