From 2ffb3147bc3e44fa76a470f181f5923fbdce9c77 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 6 Jul 2015 14:02:01 -0700 Subject: [PATCH] fix up ota_from_target_files symlink detection. Change-Id: I10b668096d4e61e75473dd805f96387049f29b79 --- tools/releasetools/ota_from_target_files.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 168f6dc330..a87363babb 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -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