Changeset 698

Timestamp:

05/26/07 18:05:29 (6 years ago)

Author:

max

Message:

Eliminate warnings on new components install caused by [697]

Files:

• applications/shepherd (modified) (4 diffs)
• status (modified) (1 diff)

applications/shepherd

@@ -2 +2 @@
 
 my $progname = 'shepherd';
-my $version = '0.4.93';
+my $version = '0.4.94';
 
 # tv_grab_au
@@ -543 +543 @@
     &log("Testing $proggy ... ") unless ($quiet);
 
-    my $ldir = query_ldir($proggy, $progtype);
     my $progname = query_filename($proggy, $progtype);
     $progname .= "-".$specific_version if ((defined $specific_version) && ($specific_version ne ""));
@@ -550 +549 @@
     $opt_ready ||= '--version';
     
-    my ($result,$resultmsg,$test_output) = call_prog($proggy, $progname." $opt_ready"." 2>&1",1,1,0);
+    my ($result,$resultmsg,$test_output) = call_prog($proggy, $progname." $opt_ready"." 2>&1",1,1,0, $progtype);
 
     &log(1, "Return value: $result\n") unless ($quiet);
@@ -1138 +1137 @@
 sub call_prog
 {
-    my ($component,$prog,$want_output,$timeout,$display_output) = @_;
+    my ($component,$prog,$want_output,$timeout,$display_output,$progtype) = @_;
     $timeout = 0 if (!defined $timeout);
     $want_output = 0 if (!defined $want_output);
     $display_output = 1 if (!defined $display_output);
+    $progtype = $components->{$component}->{type} unless ($progtype);
 
     my $prog_output = "";
 
-    chdir (query_ldir($component, $components->{$component}->{type}));
+    chdir (query_ldir($component, $progtype));
 
     my $exec = sprintf "PERL5LIB=\"%s/references\" %s 2>&1|", $CWD, $prog;

status

@@ -1 @@
-application     shepherd            0.4.93
+application     shepherd            0.4.94
 reference       channel_list        2
 reference       Shepherd/Common.pm  0.10