Ticket #794: diff

File diff, 2.0 KB (added by gombasg, at 2010-01-25T12:57:08+01:00)
  • HTMLOld.pm

    diff -u -r Master.orig/HTMLOld.pm Master/HTMLOld.pm
    old new  
    169169    }; 
    170170         
    171171 
    172     if (defined $groups->{"name"} and $groups->{"name"} eq "root") { 
     172    if (defined $groups->{"name"} and $groups->{"name"} eq "__root__") { 
    173173        $groups = $groups->{"groups"};    # root->groups 
    174174    } 
    175175 
     
    509509        my $peername = munin_get_node_name($peer); 
    510510        next 
    511511            if $peername eq "contact" 
    512                 and munin_get_node_name($parent) eq "root"; 
     512                and munin_get_node_name($parent) eq "__root__"; 
    513513        if ($peername eq $me) { 
    514514            unshift @$ret, {"name" => $peername, "link" => undef}; 
    515515        } 
  • LimitsOld.pm

    diff -u -r Master.orig/LimitsOld.pm Master/LimitsOld.pm
    old new  
    250250    my $parent     = munin_get_parent($group); 
    251251    my $name       = get_notify_name($group); 
    252252 
    253     if (defined $parent and munin_get_node_name($parent) ne "root") { 
     253    if (defined $parent and munin_get_node_name($parent) ne "__root__") { 
    254254        return (get_full_group_path($parent) . " :: " . $name); 
    255255    } else { 
    256256        return $name; 
  • Utils.pm

    diff -u -r Master.orig/Utils.pm Master/Utils.pm
    old new  
    277277    $config->{'htmldir'}       ||= $Munin::Common::Defaults::MUNIN_HTMLDIR; 
    278278    $config->{'spooldir'}      ||= $Munin::Common::Defaults::MUNIN_SSPOOLDIR; 
    279279    $config->{'#%#parent'}     = undef; 
    280     $config->{'#%#name'}       = "root"; 
     280    $config->{'#%#name'}       = "__root__"; 
    281281 
    282282    return ($config); 
    283283} 
     
    920920        # Not sure when a #%#name node can go missing 
    921921        my $name = $i->{'#%#name'} || '*BUG*'; 
    922922        goto gotoparent if $name eq '*BUG*'; 
    923         last if $name eq 'root'; 
     923        last if $name eq '__root__'; 
    924924        if ($host) { 
    925925            # Into group land now 
    926926            unshift(@group,$name);