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

* commit 'dc48635b1678f74db509dc1c0142d5a5cc8df24d':
  fix up ota_from_target_files symlink detection.
This commit is contained in:
Tao Bao
2015-07-07 17:31:17 +00:00
committed by Android Git Automerger

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