[NaCl SDK] Fix zip_test failure on mac buildbots.

native_client_sdk/src/tools/oshelpers.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import fnmatch
 import glob
 import optparse
 import os
 import posixpath
 import shutil
+import stat
 import sys
 import time
 import zipfile
 
 
 def IncludeFiles(filters, files):
   """Filter files based on inclusion lists
 
   Return a list of files which match and of the Unix shell-style wildcards
   provided, or return all the files if no filter is provided."""
@@ skipping 396 matching lines @@
 
   try:
     zip_stream = zipfile.ZipFile(dest_zip, write_mode, zipfile.ZIP_DEFLATED)
     for os_path, file_info_or_zip_path, file_bytes in zip_data:
       if isinstance(file_info_or_zip_path, zipfile.ZipInfo):
         zip_path = file_info_or_zip_path.filename
       else:
         zip_path = file_info_or_zip_path
 
       if os_path:
-        zip_stream.write(os_path, zip_path)
+        if stat.S_ISDIR(os.stat(os_path).st_mode):
+          # Python 2.6 on the buildbots doesn't support writing directories to
+          # zip files. This was resolved in a later version of Python 2.6.
+          # We'll work around it by writing an empty file with the correct
+          # path. (This is basically what later versions do anyway.)
+          zip_stream.writestr(zip_path, '')

[Sam Clegg, 2012/11/30 19:01:43]

Are you sure this is all it does?  Surly there is a difference between an empty
file and a folder in the zip
format?

Looking at the code it look like it at least adds a trailing
slash.

[binji, 2012/11/30 19:43:42]

Doesn't seem to be. Though I am writing some of the ZipInfo differently this
way. I've uploaded a new patch with those changes.
Yes, but I already handle that using MakeZipPath above.

+        else:
+          zip_stream.write(os_path, zip_path)
       else:
         zip_stream.writestr(file_info_or_zip_path, file_bytes)
 
       if not options.quiet:
         if zip_path in new_files_to_add:
           operation = 'adding'
         else:
           operation = 'updating'
         zip_info = zip_stream.getinfo(zip_path)
         if (zip_info.compress_type == zipfile.ZIP_STORED or
@@ skipping 24 matching lines @@
     return 1
   func = FuncMap.get(args[0])
   if not func:
     print 'Do not recognize command: ' + args[0]
     print 'Available commands: %s' % ' '.join(FuncMap)
     return 1
   return func(args[1:])
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))