summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiko Tyni <ntyni@iki.fi>2007-05-11 20:03:52 +0200
committerNiko Tyni <ntyni@iki.fi>2007-05-11 20:03:52 +0200
commitd13567a129969c4c3ca0548d08a0d34473aca66d (patch)
tree06d33f14c67717e185ffe2df662df7eaa093deb5
parent82050d908e18016a65a9573fcfb8025d4bca4bcf (diff)
downloadsmokeping-d13567a129969c4c3ca0548d08a0d34473aca66d.tar.gz
smokeping-d13567a129969c4c3ca0548d08a0d34473aca66d.tar.xz
revert the previous Curl change, it doesn't even work...
-rw-r--r--CHANGES2
-rw-r--r--lib/Smokeping/probes/Curl.pm2
2 files changed, 1 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index a4340e7..946a7ec 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,3 @@
-* fix usage regexp in the Curl probe.
- -- niko, found from Ubuntu Launchpad #73437
* show all smoke in the detail graphs, even if it's out of the scale. -- niko,
reported by Oskar Liljeblad <oskar *osk.mine.nu> as Debian bug #412826
diff --git a/lib/Smokeping/probes/Curl.pm b/lib/Smokeping/probes/Curl.pm
index cbf7d54..5f237ab 100644
--- a/lib/Smokeping/probes/Curl.pm
+++ b/lib/Smokeping/probes/Curl.pm
@@ -204,7 +204,7 @@ sub test_usage {
my %arghash = %$arghashref;
for my $feature (keys %arghash) {
- if (`$bin $arghash{$feature} 1 127.0.0.1 2>&1` =~ /invalid (option|usage)/i) {
+ if (`$bin $arghash{$feature} 1 127.0.0.1 2>&1` =~ /invalid option|usage/i) {
push @unsupported, $feature;
$self->do_log("Note: your curl doesn't support the $feature feature (option $arghash{$feature}), disabling it");
}