Changeset 4188

Show
Ignore:
Timestamp:
02/23/09 23:23:55 (4 years ago)
Author:
gpolo
Message:

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

........

r4186 | gpolo | 2009-02-23 18:05:03 -0300 (Mon, 23 Feb 2009) | 1 line


Fixed ticket #219

........

r4187 | gpolo | 2009-02-23 18:17:36 -0300 (Mon, 23 Feb 2009) | 1 line


Default to daily view in timeline

........

Location:
trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svnmerge-integrated changed from /branch/InterfaceEditor:1-4032 /branch/NetworkInventory:1-3849,3851-3864,3876-3919,3921-3948,3953-3955,3957-4127 /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 to /branch/InterfaceEditor:1-4032 /branch/NetworkInventory:1-3849,3851-3864,3876-3919,3921-3948,3953-3955,3957-4187 /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

  • trunk/share/umit/config/timeline-settings.conf

    r3953 r4188  
    1818[Startup] 
    1919date =  
    20 mode = hourly 
     20mode = daily 
    2121kind = category 
    2222 

  • trunk/umitDB/InventoryChanges.py

    r4097 r4188  
    140140                pcdata2 = self.invdb.get_portid_and_fks_for_host_from_db( 
    141141                    hostB[1]) 
    142                  
     142 
    143143                # compare old data against new data 
    144144                category, diff_text = self._compare_data(pdata2, fpinfo2, 
    … …  
    259259        # dont consider uptime and lastboot in fingerprint (will probably 
    260260        # not consider others too) 
    261         if fpinfo1 and (fpinfo1[2:] != fpinfo2[2:]): 
     261        if (fpinfo1 and not fpinfo2) or (not fpinfo1 and fpinfo2) or \ 
     262                (fpinfo1 and fpinfo2 and fpinfo1[2:] != fpinfo2[2:]): 
    262263            space = host_diff and ' ' or '' 
    263264            common_text = space + _("Fingerprint, ") 
    … …  
    284285            fp_only = False 
    285286            ports_only = False 
    286                  
     287 
    287288        if common_text: 
    288289            if fp_only or len(common_text) == len(" Fingerprint, "): 
    … …  
    304305            # changes in extraports for example. 
    305306            affected = 'nothing' 
    306             host_diff = _("No noticeables changes since last sucessfull scan.") 
     307            host_diff = _("No noticeables changes since last sucessful scan.") 
    307308 
    308309