Commits

Palmer, 2E0EOL committed f8f88f7 Draft Merge

Merge latest fixes from rel/0.1 into default for 0.1.4 tag

Comments (0)

Files changed (3)

bin/check_disks_3ware

 
 use Data::Dumper;
 use Getopt::Std;
+use IO::Interactive qw(is_interactive);
 
 use constant TW_CLI_FILE => '/var/run/check_disks_3ware.stat';
 
 	print("UNKNOWN: No controllers checked.\n");
 	$status = 3;
 } else {
-	my $ok_msg = sprintf("OK: %u ports, %u units checked on 1 controller\n", $port_count, $unit_count);
-	if ( $> == 0 ) {
-		print(STDERR $ok_msg);
-	} else {
-		print($ok_msg);
-	}
+	printf("OK: %u ports, %u units checked on 1 controller\n", $port_count, $unit_count)
+		if ( $> != 0 || is_interactive() );
 }
 exit $status;
+nagios-plugins-daybo (0.1.4) stable; urgency=low
+
+  * e109b6427585: Attempt #2 to fix issue #3
+  * fa829e6d6b43: Merge backout only (issue #3)
+  * b098a42e4c18: Backed out changeset 92e5be755d97
+
+ -- David Palmer <palmer@overchat.org>  Sat, 11 Aug 2012 12:04:01 +0100
+
 nagios-plugins-daybo (0.1.3) stable; urgency=low
 
   * 92e5be755d97: Hack to avoid resolve issue #3
 
 Package: nagios-plugins-daybo
 Architecture: all
-Depends: ${misc:Depends} ${shlibs:Depends}, perl
+Depends: ${misc:Depends} ${shlibs:Depends}, perl, libio-interactive-perl
 Description: Daybo Logic-authored Nagios plugin collection
  These plugins are used by Daybo Logic, and are provided to the community in
  the hope that others will find them useful.