Show
Ignore:
Timestamp:
02/19/09 18:45:47 (4 years ago)
Author:
gpolo
Message:

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

........

r4125 | gpolo | 2009-02-19 10:01:17 -0300 (Thu, 19 Feb 2009) | 1 line


Removing remaining old copyright notices

........

r4126 | gpolo | 2009-02-19 10:13:13 -0300 (Thu, 19 Feb 2009) | 3 lines


  • Fixed check for hostname existence;
  • Corrected some typos in comments.

........

Location:
trunk
Files:
2 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-4053,4065-4072,4082-4084 /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-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
  • trunk/umitInventory/InventoryTree.py

    r4097 r4128  
    167167 
    168168                if self.show_hosts_by == HOSTNAME: # default mode 
    169                     if addr[3]: # check for hosts existance 
     169                    if addr[3] and addr[3][0]: # check for hostnames existence 
    170170                        append_now = addr[3][0] # show first hostname 
    171171 
    172172                elif self.show_hosts_by == IPV6: 
    173                     if addr[1]: # check for ipv6 existance 
     173                    if addr[1]: # check for ipv6 existence 
    174174                        append_now = addr[1] 
    175175 
    176176                elif self.show_hosts_by == MAC: 
    177                     if addr[2]: # check for ipv6 existance 
     177                    if addr[2]: # check for mac existence 
    178178                        append_now =  addr[2] 
    179179 
     
    197197        Open Inventory for editing. 
    198198        """ 
    199         # checking for inventory existance in schemas file. 
     199        # checking for inventory existence in schemas file. 
    200200        schemas = ConfigParser() 
    201201        schemas.read(Path.sched_schemas)