m-a support for dsa-check-packages

diff --git a/dsa-nagios-checks/checks/dsa-check-packages b/dsa-nagios-checks/checks/dsa-check-packages
index 107b94b..22bde57 100755 (executable)
--- a/dsa-nagios-checks/checks/dsa-check-packages
+++ b/dsa-nagios-checks/checks/dsa-check-packages
@@ -61,54 +61,77 @@ sub record($) {
 sub get_packages {
        $ENV{'COLUMNS'} = 1000;
        $ENV{'LC_ALL'} = 'C';
-       open(F, "dpkg --print-architecture|") or die ("Cannot run dpkg --print-architecture: $!\n");
-       my $arch = <F>;
-       chomp($arch);
-       close(F);
-
-
-       open(F, "dpkg -l|") or die ("Cannot run dpkg -l: $!\n");
+       open(F, "dpkg -l|") or die ("Cannot run dpkg: $!\n");
        my @lines = <F>;
        close(F);
        chomp(@lines);
 
-       shift @lines while ($lines[0] !~ /\+\+\+/);
-       shift @lines;
+       my $line;
+       my $has_arch = 0;
+       while (defined($line = shift @lines) && ($line !~ /\+\+\+/)) {
+               if ($line =~ /Architecture/) { $has_arch = 1; }
+       }
 
        my %pkgs;
-       for my $line (@lines) {
-               my ($state, $pkg, $version, undef) = split(/  */, $line);
-               $pkg =~ s/\Q:$arch\E$//;
-               $pkgs{$state}{$pkg} = { 'installed' => $version }
+       for $line (@lines) {
+               my ($state, $pkg, $version, $arch, undef) = split(/  */, $line);
+               $arch = '' unless $has_arch;
+               $pkgs{$state}{$pkg} = { 'installed' => $version, arch => $arch }
        }
 
        my $installed = $pkgs{'ii'};
        delete $pkgs{'ii'};
 
+       my @installed_packages = keys(%$installed);
+       my @cmd = ("apt-cache", "policy", @installed_packages);
+
        open my $olderr, ">&STDERR"   or die "Can't dup STDERR: $!";
        open     STDERR, ">/dev/null" or die "Can't dup STDOUT: $!";
-
-       open (F, "apt-cache policy ".(join(" ", keys(%$installed)))." |") or die ("Cannot run apt-cache policy: $!\n");
+       open (F, "-|", @cmd) or die ("Cannot run apt-cache policy: $!\n");
        @lines = <F>;
        close(F);
-       chomp(@lines);
        open STDERR, ">&", $olderr  or die "Can't dup OLDERR: $!";
+       chomp(@lines);
 
-       my $line;
        my $pkgname = undef;
        while (defined($line = shift @lines)) {
                if ($line =~ /^([^ ]*):$/) {
+                       # when we have multi-arch capable fu, we require that
+                       # apt-cache policy output is in the same order as its
+                       # arguments.
+                       #
+                       # We needs thi, because the output block in apt-cache
+                       # policy does not show the arch:
+                       #
+                       # | weasel@stanley:~$ apt-cache policy libedit2:amd64
+                       # | libedit2:
+                       # |   Installed: 2.11-20080614-5
+                       # |   Candidate: 2.11-20080614-5
+                       #
+                       # We replace the package name in the output with the
+                       # one we asked for ($pkg:$arch) - but to match this up
+                       # sanely we need the order to be correct.
+                       #
+                       # For squeeze systems (no m-a), apt-cache policy output
+                       # is all different.
                        $pkgname = $1;
+                       if ($has_arch) {
+                               my $from_list = shift @installed_packages;
+                               next if ($pkgname eq $from_list); # no :$arch in pkgname we asked for
+
+                               my $ma_fix_pkgname = $pkgname.':'.$installed->{$from_list}->{'arch'};
+                               ($ma_fix_pkgname eq $from_list) or die "Unexpected order mismatch in apt-cache policy output\n";
+                               # print $pkgname, " - ", $from_list, "\n";
+                               $pkgname = $from_list;
+                       }
                } elsif ($line =~ /^ +Installed: (.*)$/) {
                        # etch dpkg -l does not print epochs, so use this info, it's better
                        $installed->{$pkgname}{'installed'} = $1;
                } elsif ($line =~ /^ +Candidate: (.*)$/) {
                        $installed->{$pkgname}{'candidate'} = $1;
                } elsif ($line =~ /^ +\*\*\*/) {
-                       my @l;
-                       @l = split(/ +/, $line);
                        $line = shift @lines;
-                       @l = split(/ +/, $line);
+                       my @l = split(/ +/, $line);
                        $installed->{$pkgname}{'origin'} = $l[2];
                }
        }
@@ -118,10 +141,10 @@ sub get_packages {
                my $pkg = $installed->{$pkgname};
 
                unless (defined($pkg->{'candidate'}) && defined($pkg->{'origin'})) {
-                        $obsolete{$pkgname} = $pkg;
-                        next;
-              }
-                       
+                       $obsolete{$pkgname} = $pkg;
+                       next;
+               }
+
                if ($pkg->{'candidate'} ne $pkg->{'installed'}) {
                        $outofdate{$pkgname} = $pkg;
                        next;
@@ -304,7 +327,7 @@ my $shortout = $EXITCODE.": ".join(", ", @shortout);
 my $longout = join("\n", @longout);
 my $perfout = "|".join(" ", @perfout);
 
-print $shortout;
+print $shortout,"\n";
 print $longout,"\n";
 print $perfout,"\n";
 

diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index e7203da..3537ef1 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -15,6 +15,7 @@ dsa-nagios-checks (9X) Xnstable; urgency=low
   * dsa-check-packages: Ignore :$arch in package names of dpkg -l output,
     at least for the "primary" arch.  Does not really handle multi-arch
     packages, but it makes things work again for now.
+  * dsa-check-packages: A better multi-arch capable version.
   * dsa-check-backuppg: Ignore .dotfiles and *.old in rootdir.
 
   [ Stephen Gran ]
@@ -28,7 +29,7 @@ dsa-nagios-checks (9X) Xnstable; urgency=low
   [ Martin Zobel-Helas ]
   * Add dsa-check-drbd, taken from http://code.google.com/p/ganeti/wiki/DrbdDevicesMonitoring
 
- -- Martin Zobel-Helas <zobel@debian.org>  Sat, 15 Sep 2012 13:40:12 +0200
+ -- Peter Palfrader <weasel@debian.org>  Sun, 16 Dec 2012 10:49:48 +0100
 
 dsa-nagios-checks (92.1) unstable; urgency=low