print "found $pname, first version $pver\n" if $debug>1;
} else {
my $bver = $restrpkgs{$pname};
- `dpkg --compare-versions $bver lt $pver`;
+ `dpkg --compare-versions "$bver" lt "$pver" `;
if ( ! $? ) {
print "found $pname, better version $pver (better than $bver)\n"
if $debug>1;
my $owntot = 0;
my $mantot = 0;
my $normtot = 0;
+my %updlinks;
my $table = "<table>\n";
my $cmd1 = "apt-cache -q policy " . join(" ",sort(keys(%restrpkgs)));
my $cmd2 = "apt-get upgrade -s -o 'Debug::NoLocking=true' ";
# Note, do not append -qq, we want some output even when nothing to do
+ print "ssh -q $H \"$cmd1 ; $cmd2 \" 2>/dev/null" if ($debug>1);
my $apt = `ssh -q $H "$cmd1 ; $cmd2 " 2>/dev/null`;
if ( !$apt ) {
$table .= "<tr><td colspan='3'> </td></tr>\n";
( $restrinst ne $bver ) ) {
# if different, it is a regular apt upgrade, and will be seen
# later. AND we want to have a different version in our repo
- `dpkg --compare-versions $bver lt $restrinst`;
+ `dpkg --compare-versions "$bver" lt "$restrinst" `;
if ( $? ) { # It was not a downgrade
# manual packages may be ahead of the repo!
$mantot++;
# Mostly because the host names would not make proper WikiWords
$updlink =~ s/Bugzilla3Updates/BugzillaUpdates/;
$updlink =~ s/Opencontent-solrUpdates/OpenContentSolrUpdates/;
+ $updlinks{$H} = $updlink;
$table .= " <a href='$updlink' >Upd</a>";
$table .= "</td></tr>\n";
$table .= "<tr><td>$hostcomments{$H}</td></tr>\n"
" / " . scalar(keys(%secpkgs)) . " / $sectot </td>\n" ;
print F "<td>";
for my $HH ( sort(keys(%sechosts)) ) {
- print F "<a href='#$HH'><b>$HH</b></a> ";
+ my $upd = $updlinks{$HH} || "#" ;
+ print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>,</a> ";
}
print F "</td>";
print F "<td>";
" / " . scalar(keys(%ownpkgs)) . " / $owntot </td>\n" ;
print F "<td>";
for my $HH ( sort(keys(%ownhosts)) ) {
- print F "<a href='#$HH'><b>$HH</b></a> ";
+ my $upd = $updlinks{$HH} || "#" ;
+ print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>,</a> ";
+ #print F "<a href='#$HH'><b>$HH</b></a> ";
}
print F "</td>";
print F "<td>";
" / " . scalar(keys(%manpkgs)) . " / $mantot </td>\n" ;
print F "<td>";
for my $HH ( sort(keys(%manhosts)) ) {
- print F "<a href='#$HH'><b>$HH</b></a> ";
+ my $upd = $updlinks{$HH} || "#" ;
+ print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>,</a> ";
+ #print F "<a href='#$HH'><b>$HH</b></a> ";
}
print F "</td>";
print F "<td>";
" / " . scalar(keys(%normpkgs)) . " / $normtot </td>\n" ;
print F "<td>";
for my $HH ( sort(keys(%normhosts)) ) {
- print F "<a href='#$HH'><b>$HH</b></a> ";
+ my $upd = $updlinks{$HH} || "#" ;
+ print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>,</a> ";
+ #print F "<a href='#$HH'><b>$HH</b></a> ";
}
print F "</td>";
print F "<td>";
print F "<tr><td>Skipped " . scalar(keys(%skiphosts)) . "</td>\n";
print F "<td colspan='2'>";
for my $HH ( sort(keys(%skiphosts)) ) {
- print F "<a href='#$HH'><b>$HH</b></a> ";
+ my $upd = $updlinks{$HH} ||
+ $wikilink . ucfirst($HH) . "Updates" . $year;
+ print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>,</a> ";
+ #print F "<a href='#$HH'><b>$HH</b></a> ";
}
print F "</td></tr>\n";
}
print F "<tr><td>Ok " . scalar(keys(%okhosts)) . "</td>\n";
print F "<td colspan='2'>";
for my $HH ( sort(keys(%okhosts)) ) {
- print F "<a href='#$HH'><b>$HH</b></a> ";
+ my $upd = $updlinks{$HH} || "#" ;
+ print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>,</a> ";
+ #print F "<a href='#$HH'><b>$HH</b></a> ";
}
if ( !%okhosts ) {
print F "<b>None at all!</b>";