From 69a6a467da589cfa124afba38c964635d38396e8 Mon Sep 17 00:00:00 2001
From: Heikki Levanto <heikki@indexdata.dk>
Date: Mon, 21 May 2012 16:07:10 +0200
Subject: [PATCH] Old edits

---
 aptcheck/aptcheck.pl |   31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/aptcheck/aptcheck.pl b/aptcheck/aptcheck.pl
index 7801291..2b769f2 100755
--- a/aptcheck/aptcheck.pl
+++ b/aptcheck/aptcheck.pl
@@ -76,7 +76,7 @@ for my $pline ( split("\n",$restplines) ) {
             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;
@@ -111,6 +111,7 @@ my $sectot = 0;
 my $owntot = 0;
 my $mantot = 0;
 my $normtot = 0;
+my %updlinks;
 
 my $table = "<table>\n";
 
@@ -124,6 +125,7 @@ for my $hline ( split("\n",$hostlist) ) {
     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'>&nbsp;</td></tr>\n";
@@ -151,7 +153,7 @@ for my $hline ( split("\n",$hostlist) ) {
                  ( $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++;
@@ -227,6 +229,7 @@ for my $hline ( split("\n",$hostlist) ) {
     # Mostly because the host names would not make proper WikiWords
     $updlink =~ s/Bugzilla3Updates/BugzillaUpdates/; 
     $updlink =~ s/Opencontent-solrUpdates/OpenContentSolrUpdates/; 
+    $updlinks{$H} = $updlink;
     $table .= "&nbsp;<a href='$updlink' >Upd</a>";
     $table .= "</td></tr>\n";
     $table .= "<tr><td>$hostcomments{$H}</td></tr>\n"
@@ -264,7 +267,8 @@ if ( $sectot ) {
         "&nbsp;/&nbsp;" .  scalar(keys(%secpkgs)) . "&nbsp;/&nbsp;$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>";
@@ -279,7 +283,9 @@ if ( $owntot ) {
         "&nbsp;/&nbsp;" .  scalar(keys(%ownpkgs)) . "&nbsp;/&nbsp;$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>";
@@ -294,7 +300,9 @@ if ( $mantot ) {
         "&nbsp;/&nbsp;" .  scalar(keys(%manpkgs)) . "&nbsp;/&nbsp;$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>";
@@ -309,7 +317,9 @@ if ( $normtot ) {
         "&nbsp;/&nbsp;" .  scalar(keys(%normpkgs)) . "&nbsp;/&nbsp;$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>";
@@ -323,7 +333,10 @@ if ( %skiphosts ) {
     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";
 }
@@ -332,7 +345,9 @@ if ( 1 ) {
     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>";
-- 
1.7.10.4