X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-packages;h=107b94bdc53509a461e72ae0292b305003fa13b9;hb=aa337ba13d4f6fc398e38bd1ae8b62b22ec088db;hp=9a28c5a666fe95250a01e5df2fe7c08c98ed52be;hpb=48bc88db6908cf5e096b08fd4846bccf163e34c6;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..107b94b 100755
--- a/dsa-nagios-checks/checks/dsa-check-packages
+++ b/dsa-nagios-checks/checks/dsa-check-packages
@@ -61,7 +61,13 @@ sub record($) {
 sub get_packages {
 	$ENV{'COLUMNS'} = 1000;
 	$ENV{'LC_ALL'} = 'C';
-	open(F, "dpkg -l|") or die ("Cannot run dpkg: $!\n");
+	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");
 	my @lines = <F>;
 	close(F);
 	chomp(@lines);
@@ -72,6 +78,7 @@ sub get_packages {
 	my %pkgs;
 	for my $line (@lines) {
 		my ($state, $pkg, $version, undef) = split(/  */, $line);
+		$pkg =~ s/\Q:$arch\E$//;
 		$pkgs{$state}{$pkg} = { 'installed' => $version }
 	}