Rev 5666: (jelmer) Set proper permissions on directories in zip files. (Jelmer in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5666 [merge]
revision-id: pqm at pqm.ubuntu.com-20110216200038-qnsaoot0pj4lr8o4
parent: pqm at pqm.ubuntu.com-20110216192255-ihgckago297tcp5z
parent: jelmer at samba.org-20110216172010-dp91q6ar15qf66pi
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-02-16 20:00:38 +0000
message:
  (jelmer) Set proper permissions on directories in zip files. (Jelmer
   Vernooij)
modified:
  bzrlib/export/zip_exporter.py  zip_exporter.py-20051114235828-8f57f954fba6497e
  bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
=== modified file 'bzrlib/export/zip_exporter.py'
--- a/bzrlib/export/zip_exporter.py	2010-03-08 02:23:17 +0000
+++ b/bzrlib/export/zip_exporter.py	2011-02-16 17:20:10 +0000
@@ -37,9 +37,10 @@
 # Or it won't consider the entry a directory
 ZIP_DIRECTORY_BIT = (1 << 4)
 FILE_PERMISSIONS = (0644 << 16)
+DIR_PERMISSIONS = (0755 << 16)
 
 _FILE_ATTR = stat.S_IFREG | FILE_PERMISSIONS
-_DIR_ATTR = stat.S_IFDIR | ZIP_DIRECTORY_BIT
+_DIR_ATTR = stat.S_IFDIR | ZIP_DIRECTORY_BIT | DIR_PERMISSIONS
 
 
 def zip_exporter(tree, dest, root, subdir, filtered=False,

=== modified file 'bzrlib/tests/blackbox/test_export.py'
--- a/bzrlib/tests/blackbox/test_export.py	2010-09-23 02:56:19 +0000
+++ b/bzrlib/tests/blackbox/test_export.py	2011-02-16 17:20:10 +0000
@@ -148,7 +148,8 @@
         self.assertEqual(['test/a', 'test/b/', 'test/b/c', 'test/d/'], names)
 
         file_attr = stat.S_IFREG | export.zip_exporter.FILE_PERMISSIONS
-        dir_attr = stat.S_IFDIR | export.zip_exporter.ZIP_DIRECTORY_BIT
+        dir_attr = (stat.S_IFDIR | export.zip_exporter.ZIP_DIRECTORY_BIT |
+                    export.zip_exporter.DIR_PERMISSIONS)
 
         a_info = zfile.getinfo(names[0])
         self.assertEqual(file_attr, a_info.external_attr)

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-02-14 12:03:05 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-02-16 17:20:10 +0000
@@ -50,6 +50,9 @@
 * ``bzr annotate -r-1 file`` will now properly annotate a deleted file.
   (Andrew King, #537442)
 
+* ``bzr export`` to zip files will now set a mode on directories.
+  (Jelmer Vernooij, #207253)
+
 * ``bzr push --overwrite`` with an older revision specified will now correctly
   roll back the target branch. (Jelmer Vernooij, #386576)