X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-packages;h=3ea088d9bd46c16a13948fc38bb5ca26d5222d96;hb=dada4218cea097e1007089fd24041d3bc4d35e43;hp=9a28c5a666fe95250a01e5df2fe7c08c98ed52be;hpb=73023766bd955e2821104646c3a57d48cf209596;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-packages b/dsa-nagios-checks/checks/dsa-check-packages
index 9a28c5a..3ea088d 100755
--- a/dsa-nagios-checks/checks/dsa-check-packages
+++ b/dsa-nagios-checks/checks/dsa-check-packages
@@ -66,42 +66,77 @@ sub get_packages {
 	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);
-		$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'};
+				my $ma_fix_from_list = $from_list.':'.$installed->{$from_list}->{'arch'};
+
+				if ($pkgname eq $ma_fix_from_list || # e.g. ia32-libs-i386.  dpkg -l: ia32-libs-i386, apt-cache policy: ia32-libs-i386:i386
+				    $ma_fix_pkgname eq $from_list) {
+					$pkgname = $from_list;
+				} else {
+					die "Unexpected order mismatch in apt-cache policy output (apt-cache policy name: $pkgname - dpkg -l name: $from_list)\n";
+				}
+			}
 		} 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];
 		}
 	}
@@ -111,10 +146,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;
@@ -297,7 +332,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";