Changeset 3865

Timestamp:

12/25/08 19:35:02 (4 years ago)

Author:

gpolo

Message:

Always remove a finished scan from the running scans list

Files:

• branch/NetworkInventory/umitInventory/InventoryTree.py (modified) (2 diffs)

branch/NetworkInventory/umitInventory/InventoryTree.py

@@ -24 +24 @@
 import gtk
 import gobject
+import traceback
 from ConfigParser import ConfigParser, NoSectionError
 
@@ -292 +293 @@
 
             if not scan_state: # scan finished
-                XMLStore(Path.umitdb_ng, scan.get_xml_output_file(),
-                         inventory=inventory)
-                scan.close()
-                todelete.append(scan)
+                try:
+                    XMLStore(Path.umitdb_ng, scan.get_xml_output_file(),
+                             inventory=inventory)
+                except Exception:
+                    # failed while adding scan to the database
+                    dlg = GenericAlert(_("Database couldn't be updated!"),
+                            _("The scan for the Inventory %r finished but "
+                                "its results couldn't be added to the "
+                                "database.\n\n%s" % (inventory,
+                                    traceback.format_exc())),
+                                buttons={1: (gtk.RESPONSE_OK, gtk.STOCK_OK)})
+                    dlg.run()
+                    dlg.destroy()
+                finally:
+                    scan.close()
+                    todelete.append(scan)
 
         for td in todelete: # remove finished scans from running_scans