commit 2e4dd9ab2635f6a22df407ae1ee4dc16e0601102
author Tao Bao <tbao@google.com> Sat Jul 11 00:58:32 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jul 11 00:58:32 2015 +0000
tree 085e6f3d0529f4f538673e38d03c67164d24ddb1
parent c881249354d9a847b09d314fd1a64bbab122f0fa
parent 2a410587e810babe0871f1ef2a6f20d06f3269d8

Merge "Fix the permission in common.ZipWriteStr()."

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 87099c2..cffb4bd 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -908,7 +908,7 @@
     zinfo = zipfile.ZipInfo(filename=zinfo_or_arcname)
     zinfo.compress_type = zip_file.compression
     if perms is None:
-      perms = 0o644
+      perms = 0o100644
   else:
     zinfo = zinfo_or_arcname
 
@@ -918,6 +918,9 @@
 
   # If perms is given, it has a priority.
   if perms is not None:
+    # If perms doesn't set the file type, mark it as a regular file.
+    if perms & 0o770000 == 0:
+      perms |= 0o100000
     zinfo.external_attr = perms << 16
 
   # Use a fixed timestamp so the output is repeatable.