[Checkins] SVN: Products.GenericSetup/trunk/Products/GenericSetup/context.py - fixed the last fix

Yvo Schubbe y.2009 at wcm-solutions.de
Sun Dec 13 07:57:08 EST 2009


Log message for revision 106445:
  - fixed the last fix

Changed:
  U   Products.GenericSetup/trunk/Products/GenericSetup/context.py

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/context.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/context.py	2009-12-13 12:14:34 UTC (rev 106444)
+++ Products.GenericSetup/trunk/Products/GenericSetup/context.py	2009-12-13 12:57:08 UTC (rev 106445)
@@ -382,14 +382,15 @@
 
         names = []
         for info in self._archive.getmembers():
-            name = info.name
+            name = info.name.rstrip('/')
             if name == path or not name.startswith(path):
                 continue
             name = name[pfx_len:]
+            if '/' in name:
+                # filter out items in subdirs
+                continue
             if name in skip:
                 continue
-            if '/' in name and not info.isdir():
-                continue
             if [s for s in skip_suffixes if name.endswith(s)]:
                 continue
             names.append(name)



More information about the checkins mailing list