commit 1fe8e816e2efb936cd842152f7d3d727692ff68c
author Adam Michael <ajmichael@google.com> Wed Nov 16 21:25:01 2016 +0000
committer Kristina Chodorow <kchodorow@google.com> Thu Nov 17 18:18:08 2016 +0000
tree 40c20870b82c331ecc0ecd02c1b725a1b17fd884
parent 013956116f9dc2abf2f4c9eb6d1f9c7bfb3cb295

resource_extractor.py should preserve the timestamps of entries of the input JAR

RELNOTES:

--
MOS_MIGRATED_REVID=139370787

tools/android/resource_extractor.py

diff --git a/tools/android/resource_extractor.py b/tools/android/resource_extractor.py
index 5177d5e..2cd11d9 100644
--- a/tools/android/resource_extractor.py
+++ b/tools/android/resource_extractor.py
@@ -90,7 +90,7 @@
 def ExtractResources(input_jar, output_zip):
   for path in input_jar.namelist():
     if IsValidPath(path):
-      output_zip.writestr(path, input_jar.read(path))
+      output_zip.writestr(input_jar.getinfo(path), input_jar.read(path))
 
 
 def main(argv):

tools/android/resource_extractor_test.py

diff --git a/tools/android/resource_extractor_test.py b/tools/android/resource_extractor_test.py
index 77a4a37..de5b6a8 100644
--- a/tools/android/resource_extractor_test.py
+++ b/tools/android/resource_extractor_test.py
@@ -62,6 +62,14 @@
                            "not_CVS/include", "META-INF/services/foo"),
                           output_zip.namelist())
 
+  def testTimestampsAreTheSame(self):
+    input_jar = zipfile.ZipFile(StringIO.StringIO(), "w")
+    entry_info = zipfile.ZipInfo("a", (1982, 1, 1, 0, 0, 0))
+    input_jar.writestr(entry_info, "")
+    output_zip = zipfile.ZipFile(StringIO.StringIO(), "w")
+    resource_extractor.ExtractResources(input_jar, output_zip)
+    self.assertEqual((1982, 1, 1, 0, 0, 0), output_zip.getinfo("a").date_time)
+
 
 if __name__ == "__main__":
   unittest.main()