From 465f6106b5a8c9089d33e2380a1d5ec58dd0bd5e Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 7 Nov 2011 09:39:11 +0000 Subject: Fixed up ack parsing. --- debian/changelog | 6 ++++++ lib/mauve/notifiers/xmpp.rb | 2 +- lib/mauve/version.rb | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e614843..4f2c03b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mauvealert (3.6.1) stable; urgency=low + + * Fixed up alert ack parsing a bit. + + -- Patrick J Cherry Mon, 07 Nov 2011 09:38:05 +0000 + mauvealert (3.6.0) stable; urgency=low * Changed ack command to split on spaces or commas or both diff --git a/lib/mauve/notifiers/xmpp.rb b/lib/mauve/notifiers/xmpp.rb index 8254494..44c6f16 100644 --- a/lib/mauve/notifiers/xmpp.rb +++ b/lib/mauve/notifiers/xmpp.rb @@ -565,7 +565,7 @@ EOF alerts, n_hours, type_hours, dhms, note = [$1,$2, $3, $4, $5] - alerts = alerts.split(/\D/) + alerts = alerts.split(/\D+/) n_hours = case dhms when /^day/ diff --git a/lib/mauve/version.rb b/lib/mauve/version.rb index c6db6b0..487b3a6 100644 --- a/lib/mauve/version.rb +++ b/lib/mauve/version.rb @@ -5,6 +5,6 @@ module Mauve # # Current version - VERSION="3.6.0" + VERSION="3.6.1" end -- cgit v1.2.1