[Zope-Checkins] SVN: Zope/trunk/ - Collector #1628: FTP server has been broken (directory

[Andreas Jung]

Log message for revision 29232:
        - Collector #1628: FTP server has been broken (directory
          listings did not work)
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/OFS/ObjectManager.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2005-02-21 12:09:27 UTC (rev 29231)
+++ Zope/trunk/doc/CHANGES.txt	2005-02-21 14:28:25 UTC (rev 29232)
@@ -22,8 +22,6 @@
 
    - Port ZOPE_CONFIG patch from Zope 2.7 to Zope 2.8
 
-   - Fix the FTP server: Collector #1628
-
    - check if ExtendedPathIndex might be a reasonable replacement for PathIndex
 
   after Zope 2.8a1
@@ -60,6 +58,9 @@
 
     Bugs fixed
 
+      - Collector #1628: FTP server has been broken (directory
+        listings did not work)
+
       - Collector #1705: CopySource._postCopy is never called
 
       - Collector #1617: Fixed crash in ZPT code (caused by improper

Modified: Zope/trunk/lib/python/OFS/ObjectManager.py
===================================================================
--- Zope/trunk/lib/python/OFS/ObjectManager.py	2005-02-21 12:09:27 UTC (rev 29231)
+++ Zope/trunk/lib/python/OFS/ObjectManager.py	2005-02-21 14:28:25 UTC (rev 29232)
@@ -664,10 +664,10 @@
                     ):
                     mode=mode | 0770
             except: pass
+
             if nobody.allowed(
-                self.manage_FTPlist,
-                getRoles(self, 'manage_FTPlist', self.manage_FTPlist, ()),
-                self.manage_FTPlist.__roles__):
+                self,
+                getRoles(self, 'manage_FTPlist', self.manage_FTPlist, ())):
                 mode=mode | 0007
         mtime=self.bobobase_modification_time().timeTime()
         # get owner and group