Changeset 3271

Timestamp:

4 Mar 2008, 15:17:36 (17 years ago)

Author:

joachim

Message:

check if pending file exists,
check for valid import_mode

File:

• WAeUP_SRP/base/WAeUPTool.py (modified) (2 diffs)

WAeUP_SRP/base/WAeUPTool.py

@@ -1482 +1482 @@
             error_string = ""
             total += 1
-            import_mode = item.get('import_mode','edit')
+            import_mode = item.get('import_mode','')
             import_method = getattr(importer, '%(import_mode)s' % vars(),None )
             if import_method is None:
-                error_string += "no %(import_mode)s " % vars()
+                error_string += "import_mode '%(import_mode)s' is invalid" % vars()
             elif (import_mode in importer.required_modes and
                 not set(importer.required_keys[import_mode]).issubset(set(item.keys()))):
@@ -1578 +1578 @@
                     logger.info(msg)
         elapse = time.time() - elapse
-        copy2(pending_path,pending_backup)
+        if os.path.exists(pending_path):
+            copy2(pending_path,pending_backup)
         copy2(pending_tmp,pending_path)
         msg = "finished importing from %(import_source_fn)s in %(elapse).2f seconds, " % vars()