Changeset 4290

Show
Ignore:
Timestamp:
03/06/09 01:09:25 (4 years ago)
Author:
gpolo
Message:

Merged revisions 4288 via svnmerge from
http://svn.umitproject.org/svnroot/umit/branch/NetworkInventory

........

r4288 | gpolo | 2009-03-05 21:41:28 -0300 (Thu, 05 Mar 2009) | 1 line


Python 2.4 compatibility.

........

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svnmerge-blocked changed from /branch/UmitPlugins:2994-2996,2999-3007,3009,3012,3016-3028,3032-3033,3074-3076,3087,3089-3090,3093-3097,3101-3104,3109,3111,3113-3119,3126-3127,3129,3132,3134,3142,3152,3233,3790-3791 /branch/NetworkInventory:3850,3865-3875,3920,3949-3952,3956 to /branch/NetworkInventory:3850,3865-3875,3920,3949-3952,3956 /branch/UmitPlugins:2994-2996,2999-3007,3009,3012,3016-3028,3032-3033,3074-3076,3087,3089-3090,3093-3097,3101-3104,3109,3111,3113-3119,3126-3127,3129,3132,3134,3142,3152,3233,3790-3791
    • Property svnmerge-integrated changed from /branch/InterfaceEditor:1-4268 /branch/UmitPlugins:1-2993,2997-2998,3008,3010-3011,3013-3015,3029-3031,3034-3073,3077-3086,3088,3091-3092,3098-3100,3105-3108,3110,3112,3120-3125,3128,3130-3131,3133,3135-3141,3143-3151,3153-3232,3234-3789,3792-4112 /branch/NetworkInventory:1-3849,3851-3864,3876-3919,3921-3948,3953-3955,3957-4236 to /branch/NetworkInventory:1-3849,3851-3864,3876-3919,3921-3948,3953-3955,3957-4289 /branch/UmitPlugins:1-2993,2997-2998,3008,3010-3011,3013-3015,3029-3031,3034-3073,3077-3086,3088,3091-3092,3098-3100,3105-3108,3110,3112,3120-3125,3128,3130-3131,3133,3135-3141,3143-3151,3153-3232,3234-3789,3792-4112 /branch/InterfaceEditor:1-4268

  • trunk/umit/inventory/InventoryTree.py

    r4240 r4290  
    294294                xmlstore = XMLStore(Path.umitdb_ng) 
    295295                try: 
    296                     xmlstore.store(scan.get_xml_output_file(), 
    297                             inventory=inventory) 
    298                 except Exception: 
    299                     # failed while adding scan to the database 
    300                     dlg = GenericAlert(_("Database couldn't be updated!"), 
    301                             (_("The scan for the Inventory") + 
    302                                 (" %r " % inventory) + 
    303                                 _("finished but it couldn't be added to the " 
    304                                     "database.") + 
    305                                 ("\n\n%s" % traceback.format_exc())), 
    306                             buttons={1: (gtk.RESPONSE_OK, gtk.STOCK_OK)}) 
    307                     dlg.run() 
    308                     dlg.destroy() 
     296                    try: 
     297                        xmlstore.store(scan.get_xml_output_file(), 
     298                                inventory=inventory) 
     299                    except Exception: 
     300                        # failed while adding scan to the database 
     301                        dlg = GenericAlert(_("Database couldn't be updated!"), 
     302                                (_("The scan for the Inventory") + 
     303                                    (" %r " % inventory) + 
     304                                    _("finished but it couldn't be added to " 
     305                                        "the database.") + 
     306                                    ("\n\n%s" % traceback.format_exc())), 
     307                                buttons={1: (gtk.RESPONSE_OK, gtk.STOCK_OK)}) 
     308                        dlg.run() 
     309                        dlg.destroy() 
    309310                finally: 
    310311                    xmlstore.close() # close connection to the database