Changeset 926 for dasscm/trunk

Timestamp:

Jul 30, 2010, 6:45:47 PM (14 years ago)

Author:

joergs

Message:

supress plugin test outputs, also when combinied commands by &&, add increase output

File:

• dasscm/trunk/usr/bin/dasscm (modified) (2 diffs)

dasscm/trunk/usr/bin/dasscm

@@ -696 +696 @@
     my $command = shift;
 
-    #print "executing command: " . $command . "\n";
-
-    open( RESULT, "LANG=C " . $command . ' 2>&1 |' );
-    my @result = <RESULT>;
-    close(RESULT);
+    if ($verbose) {
+        print "executing command: " . $command . "\n";
+    }
+
+    my @result;
+    if(  open( RESULT, $command . ' 2>&1 |' ) ) {
+        @result = <RESULT>;
+        close(RESULT);
+    }
     my $retcode = $? >> 8;
 
-    #print @result;
-    #if( $retcode ) { print "return code: " . $retcode . "\n"; }
+    if ($verbose) {
+        print @result;
+        if( $retcode ) { print "return code: " . $retcode . "\n"; }
+    }
 
     return ( $retcode, @result );
@@ -790 +796 @@
         my $plugin_name = substr( $plugin, length("DASSCM_PLUGIN_CMD_") );
         my $plugin_test = $config->{ 'DASSCM_PLUGIN_TEST_' . $plugin_name };
-        ( my $rc_test, my @result_test ) = run_command($plugin_test);
         if ($verbose) { print "Plugin $plugin_name: "; }
+        # all plugins are executed with LANG settings C
+        # bash -c is used, to supress all output 
+        # (otherwise there are problem with && commands)
+        ( my $rc_test, my @result_test ) = run_command( "LANG=C bash -c " . $plugin_test);
         if ( $rc_test != 0 ) {
             if ($verbose) { print "skipped\n"; }