summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Clark <jon.h.clark@gmail.com>2011-03-11 09:05:04 -0500
committerJonathan Clark <jon.h.clark@gmail.com>2011-03-11 09:05:04 -0500
commiteaddcca02022bc5b7c122ca456c98c608f60985d (patch)
tree9baf6c80d49bf62d92631f919c4e9641b3aff1d3
parentd93815d18783d0cc3d8185f1dc8b96ff3f11b5dd (diff)
fix my dumb bug that killed qsub functionality
-rwxr-xr-xvest/dist-vest.pl2
-rwxr-xr-xvest/parallelize.pl4
2 files changed, 2 insertions, 4 deletions
diff --git a/vest/dist-vest.pl b/vest/dist-vest.pl
index 973a29ef..f6f661b9 100755
--- a/vest/dist-vest.pl
+++ b/vest/dist-vest.pl
@@ -194,7 +194,6 @@ sub modbin {
my $src=$$_;
$$_="$bindir/".basename($src);
check_call("cp -p $src $$_");
- die "cp $src $$_ failed: $!" unless $? == 0;
}
}
sub dirsize {
@@ -374,7 +373,6 @@ while (1){
$nmappers++;
my $qcmd = "QSUB_CMD -N $client_name -o /dev/null -e $logdir/$client_name.ER $script_file";
my $jobid = check_output("$qcmd");
- die "qsub failed: $!\nCMD was: $qcmd" unless $? == 0;
chomp $jobid;
$jobid =~ s/^(\d+)(.*?)$/\1/g;
$jobid =~ s/^Your job (\d+) .*$/\1/;
diff --git a/vest/parallelize.pl b/vest/parallelize.pl
index 47b77c79..2798a303 100755
--- a/vest/parallelize.pl
+++ b/vest/parallelize.pl
@@ -82,7 +82,7 @@ sub preview_files {
my @f=grep { ! ($skipempty && -z $_) } @$l;
my $fn=join(' ',map {escape_shell($_)} @f);
my $cmd="tail -n $n $fn";
- check_output("$cmd").($footer?"\nNONEMPTY FILES:\n$fn\n":"");
+ unchecked_output("$cmd").($footer?"\nNONEMPTY FILES:\n$fn\n":"");
}
sub prefix_dirname($) {
#like `dirname but if ends in / then return the whole thing
@@ -323,7 +323,7 @@ sub launch_job {
}
if ($joblist == "") { $joblist = $jobid; }
else {$joblist = $joblist . "\|" . $jobid; }
- my $cleanfn=check_output("qdel $jobid 2> /dev/null");
+ my $cleanfn="qdel $jobid 2> /dev/null";
push(@cleanup_cmds, $cleanfn);
}
close QOUT;