Commits

Palmer, 2E0EOL  committed 3d74298 Draft Merge

Merge develop into stable branch

  • Participants
  • Parent commits eb4bb26, 21a60de
  • Branches stable

Comments (0)

Files changed (4)

 8ec52eb39af34f4702352d74e2cef7fb481b3273 nagios-plugins-daybo-0.1.0
 70e7f281f196cdea9651348e19e57921019d854d nagios-plugins-daybo-0.1.1
 541382c2458a45b48c33fcd4cd9cde87edda87f3 nagios-plugins-daybo-0.1.2
+5d648a98fe39ae57ddc64dda287bbde9ea41794f nagios-plugins-daybo-0.1.3
+f8f88f7a85060424b5bf74a5770db97ec8c284ff nagios-plugins-daybo-0.1.4

File 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 {
-	printf("OK: %u ports, %u units checked on 1 controller\n", $port_count, $unit_count);
+	printf("OK: %u ports, %u units checked on 1 controller\n", $port_count, $unit_count)
+		if ( $> != 0 || is_interactive() );
 }
 exit $status;

File debian/changelog

+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
+
+ -- David Palmer <palmer@overchat.org>  Wed, 25 Jul 2012 21:54:53 +0100
+
 nagios-plugins-daybo (0.1.2) stable; urgency=low
 
   * 10eb63ad1932: Patch to run tw_cli via explicit path, /usr/sbin/

File debian/control

 
 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.