Do not merge -none columns, only clear name in netlink html.

bluhm · Jul 31, 2024 · d3d05c8 · d3d05c8
1 parent e1443a6
commit d3d05c8
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/netlink-html.pl b/netlink-html.pl
@@ -167,6 +167,8 @@ sub html_hier_test_head {
 	    } elsif ($hier eq "patch" && $hv->{diff}) {
 		my $link = uri_escape($hv->{diff}, "^A-Za-z0-9\-\._~/");
 		$name = "<a href=\"../$link\">$name</a>";
+	    } else {
+		$name =~ s/.*-none$//;
 	    }
 	    print $html "    <th class=\"hier\"$title>$name</th>\n";
 	}
@@ -194,6 +196,8 @@ sub html_hier_test_head_utilization {
 	    } elsif ($hier eq "patch" && $hv->{diff}) {
 		my $link = uri_escape($hv->{diff}, "^A-Za-z0-9\-\._~/");
 		$name = "<a href=\"../$link\">$name</a>";
+	    } else {
+		$name =~ s/.*-none$//;
 	    }
 	    print $html "    <$te class=\"hier $hier\"$title>$name</$te>\n";
 	}
@@ -554,9 +558,6 @@ sub glob_result_files {
 	    warn "Invalid subdir '$_' in result '$File::Find::name'";
 	    return;
 	}
-	foreach (values %f) {
-	    delete $f{$1} if /(.*)-none$/;
-	}
 	$f{dir} = $File::Find::dir;
 	$f{name} = $File::Find::name;
 	push @files, \%f;