Hello community, here is the log from the commit of package nagios-plugins-zypper for openSUSE:Factory checked in at 2013-08-05 20:48:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nagios-plugins-zypper (Old) and /work/SRC/openSUSE:Factory/.nagios-plugins-zypper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nagios-plugins-zypper" Changes: -------- --- /work/SRC/openSUSE:Factory/nagios-plugins-zypper/nagios-plugins-zypper.changes 2013-02-23 16:38:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nagios-plugins-zypper.new/nagios-plugins-zypper.changes 2013-08-05 20:48:35.000000000 +0200 @@ -1,0 +2,33 @@ +Wed Jul 31 16:27:55 UTC 2013 - l...@linux-schulserver.de + +- update to 1.48: + + handle updates of the software stack as cricital unless we + get a fix for bnc#832605 + (workaround for bnc#830658) + +------------------------------------------------------------------- +Mon Jul 22 16:53:44 CEST 2013 - r...@suse.de + +- change logic looking for ignored packages/patches: + - use exact match, not just substring + - check also for match of name-version in the ignorelist + allowing to ignore specific updates + +------------------------------------------------------------------- +Thu May 16 13:51:38 UTC 2013 - l...@linux-schulserver.de + +- update to 1.47: + + return error if zypper is already running and blocking the + refresh of the repository + +------------------------------------------------------------------- +Tue Apr 23 17:31:59 UTC 2013 - l...@linux-schulserver.de + +- do not call openSUSE 13.1 discontinued + +------------------------------------------------------------------- +Tue Apr 16 01:07:10 CEST 2013 - r...@suse.de + +- do not call SLE11-SP3 discontinued + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-plugins-zypper.spec ++++++ --- /var/tmp/diff_new_pack.Imsn0k/_old 2013-08-05 20:48:36.000000000 +0200 +++ /var/tmp/diff_new_pack.Imsn0k/_new 2013-08-05 20:48:36.000000000 +0200 @@ -20,7 +20,7 @@ Summary: Nagios plugin for checking software updates License: BSD-4-Clause Group: System/Monitoring -Version: 1.45 +Version: 1.48 Release: 0 Url: http://en.opensuse.org/Nagios-plugins-zypper Source0: check_zypper.pl ++++++ check_zypper.pl ++++++ --- /var/tmp/diff_new_pack.Imsn0k/_old 2013-08-05 20:48:36.000000000 +0200 +++ /var/tmp/diff_new_pack.Imsn0k/_new 2013-08-05 20:48:36.000000000 +0200 @@ -50,7 +50,7 @@ # constants $PROGNAME = "check_zypper"; -$VERSION = '1.45'; +$VERSION = '1.48'; $DEBUG = 0; # variables @@ -86,8 +86,8 @@ 0 => 'OK', ); our %supported_release = ( - 'openSUSE' => [ '12.1', '12.2', '12.3' ], - 'SLE' => [ '10.4', '11.1', '11.2' ], + 'openSUSE' => [ '12.1', '12.2', '12.3', '13.1' ], + 'SLE' => [ '10.4', '11.1', '11.2' , '11.3' ], ); $opt_w = 'recommended,optional,unsupported'; $opt_c = 'security'; @@ -244,6 +244,7 @@ chomp $line; print STDERR "LINE: $line\n" if ($DEBUG); # error handling + return ( "ERROR: " . xml_re_escape($line), $ERRORS{'CRITICAL'} ) if ( $line =~ /Could not access the package manager engine.*/ ); return ( "ERROR: " . xml_re_escape($line), $ERRORS{'CRITICAL'} ) if ( $line =~ /Could not refresh repository.*/ ); return ( "ERROR: " . xml_re_escape($line), $ERRORS{'CRITICAL'} ) if ( $line =~ /There are no enabled repositories defined.*/ ); return ( "ERROR: " . xml_re_escape($line), $ERRORS{'CRITICAL'} ) if ( $line =~ /Digest verification failed.*/ ); @@ -343,7 +344,7 @@ my $status = 'new'; foreach my $name ( sort(@unsup_packagelist) ) { chomp($name); - if ( grep {/\Q$name\E/} @packagewhitelist ) { + if ( grep {$_ eq $name} @packagewhitelist ) { print STDERR "WARINING: ignoring $name as it is in \@packagewhitelist\n" if ($DEBUG); next; } @@ -361,6 +362,7 @@ print STDERR "LINE: $_\n" if ($DEBUG); # error handling + return ( 'There is a pending update of the update-stack itself. This plugin can not check if there are more updates pending.', 'CRITICAL') if (/softwaremgmt/); return ( 'UNKNOWN: ' . xml_re_escape($_), 'UNKNOWN' ) if (/not found on medium/); return ( 'UNKNOWN: ' . xml_re_escape($_), 'UNKNOWN' ) if (/I\/O error: Can't provide/); return ( 'UNKNOWN: ' . xml_re_escape($_), 'UNKNOWN' ) if (/Error message:/); @@ -384,7 +386,7 @@ || ( ( "$dist->{'name'}" eq "SLE" ) && ( "$dist->{'version'}" eq "10" ) ) ) { my ( $url, $name, $version, $category, $status ) = split( '\s*\|\s*', $_, 5 ); # just for reference - perhaps we need the variables later if ( defined($name) ) { - if ( grep {/\Q$name\E/} @patchignore ) { + if ( grep {$_ eq $name} @patchignore ) { print STDERR "WARNING: ignoring $name as it is in \@patchignore\n" if ($DEBUG); next; } @@ -399,20 +401,29 @@ else { if (/<update /) { my ($name) = $_ =~ /name="(.*?)"/; + my ($edition) = $_ =~ /edition="(.*?)"/; if (/kind="patch"/) { # line contains patch - if ( grep {/\Q$name\E/} @patchignore ) { + if ( grep {$_ eq $name} @patchignore ) { print STDERR "WARNING: ignoring $name as it is in \@patchignore\n" if ($DEBUG); next; } + if ( grep {$_ eq "$name-$edition"} @patchignore ) { + print STDERR "WARNING: ignoring $name-$edition as it is in \@patchignore\n" if ($DEBUG); + next; + } $category = 'optional' if (/category="optional"/); $category = 'recommended' if (/category="recommended"/); $category = 'security' if (/category="security"/); } elsif (/kind="package"/) { - if ( grep {/\Q$name\E/} @packageignore ) { + if ( grep {$_ eq $name} @packageignore ) { print STDERR "WARNING: ignoring $name as it is in \@packageignore\n" if ($DEBUG); next; } + if ( grep {$_ eq "$name-$edition"} @packageignore ) { + print STDERR "WARNING: ignoring $name-$edition as it is in \@packageignore\n" if ($DEBUG); + next; + } $category = 'package'; } $packagelist{"$category"}{"$name"}{'category'} = "$category"; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org