diff options
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | lib/mauve/notifiers/xmpp.rb | 8 |
3 files changed, 6 insertions, 5 deletions
@@ -17,3 +17,4 @@ e74b59c89e0c56ccbb426167b3e851382d1b04ff 3.7.0 b720f7eaf50048e8430cb3fa79cb9ea96ef1a418 3.7.1 7b0f0eac9b35e0e1bab9062263a5ef7a97018071 3.7.2 7f35d4f171ecaa46941fcb1beb5b1a026e98e985 3.7.3 +299d570786ce3029855e06090ec5314d66732b9d 3.7.4 diff --git a/debian/control b/debian/control index fcaa9a5..599ec3d 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,7 @@ Depends: mauvealert-common (>= 3.4.0), libsinatra-ruby1.8 (>= 1.0), lsb-base (>= 3.2-14), ruby1.8 (>= 1.8.7), - thin1.8 (>= 1.2.11) | thin (>= 1.2.11), + thin1.8 | thin, libxmpp4r-ruby1.8, ${misc:Depends} Suggests: mauvealert-client diff --git a/lib/mauve/notifiers/xmpp.rb b/lib/mauve/notifiers/xmpp.rb index 8a78fd3..a0ad86e 100644 --- a/lib/mauve/notifiers/xmpp.rb +++ b/lib/mauve/notifiers/xmpp.rb @@ -516,13 +516,13 @@ e.g. EOF when /^destroy/ <<EOF -Destroy command: Destroys or more alerts. +Destroy command: Destroys one or more alerts. The syntax is destroy <alert list> - * The alert list is a comma separated list. +where <alert list> is a comma separated list of alert IDs. e.g. destroy 1,2,3 -- destroys alerts 1, 2, and 3. @@ -677,9 +677,9 @@ EOF end if alert.destroy! - msg << "#{alert_id}: destroyed" + msg << "#{alert.to_s} destroyed" else - msg << "#{alert_id}: destruction failed." + msg << "#{alert.to_s}: destruction failed." end end |