Changeset 1049 for ZMS/trunk/_confmanager.py

Timestamp:

09.06.2010 21:44:53 (2 years ago)

Author:

zmsdev

Message:

Added support for import of empty folders in conf-packages. (fixes ZMSDEV#3588)

File:

• ZMS/trunk/_confmanager.py (modified) (3 diffs)

ZMS/trunk/_confmanager.py

@@ -154 +154 @@
       files = _fileutil.getZipArchive( file)
       for f in files:
-        self.importConf(f,REQUEST,createIfNotExists)
+        if not f.get('isdir'):
+          self.importConf(f,REQUEST,createIfNotExists)
       self.synchronizeObjAttrs()
 
@@ -178 +179 @@
     # --------------------------------------------------------------------------
     def importConf(self, file, REQUEST, createIfNotExists=0):
+      message = ''
       filename, xmlfile = self.getConfXmlFile( file)
       zms_system = 1
@@ -195 +197 @@
         self.format_manager.importTextformatXml(xmlfile, REQUEST, zms_system, createIfNotExists)
       xmlfile.close()
+      return message