Index: /shepherd
===================================================================
--- /shepherd (revision 168)
+++ /shepherd (revision 172)
@@ -1508,6 +1508,6 @@
 
     my $result = versioncmp($ver, $latestversion);
-    my $action =    $result == -1 ? ($ver ? "UPGRADING to v$latestversion" : "NEW") :
-		    $result ==  1 ? "DOWNGRADING to v$latestversion" :
+    my $action =    $result == -1 ? ($ver ? "UPGRADING" : "NEW") :
+		    $result ==  1 ? "DOWNGRADING" :
 		    "up to date";
     &log(sprintf    "* %-40s %30s\n",
@@ -1576,5 +1576,4 @@
     }
 
-    &log("Testing $proggy...\n") if ($debug);
     my $result = test_proggy($ldir,"$ldir/$proggy");
 
@@ -1617,4 +1616,6 @@
     my ($testdir,$proggyexec) = @_;
 
+    &log("Testing $proggyexec...\n");
+
     chdir($testdir);
     my $result = call_prog("$proggyexec --ready");
@@ -1623,6 +1624,13 @@
     print "Return value: $result\n" if ($debug);
 
-    print "\nComponent $proggyexec did not exit cleanly!\n" .
-	 "It may require configuration.\n\n" if ($result);
+    if ($result)
+    {
+	&log("\nComponent $proggyexec did not exit cleanly!\n" .
+	     "It may require configuration.\n\n");
+    }
+    else
+    {
+	&log("OK.\n");
+    }
     return !$result;
 }
@@ -1665,5 +1673,4 @@
 	my $progtype = $components->{$proggy}->{type};
 	$result = test_proggy("$CWD/$progtype" . "s/$proggy", "$CWD/$progtype" . "s/$proggy/$proggy");
-	printf "%s %s: %s\n",ucfirst($progtype), $proggy,($result ? "OK" : "Failed");
 	if (!$result ne !$components->{$proggy}->{ready}) {
 	    $components->{$proggy}->{ready} = $result;
@@ -1813,5 +1820,5 @@
 	return $?;
     } else {
-	&log((sprintf "prog exited with value %d\n", $? >> 8));
+	&log((sprintf "prog exited with value %d\n", $? >> 8)) if ($debug or $?);
 	return ($? >> 8);
     }