Changeset 25406 for branches/eam_branches/20090715/pstamp/scripts/pstamp_job_run.pl

Timestamp:

Sep 15, 2009, 4:02:42 PM (17 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/20090715/pstamp/scripts/pstamp_job_run.pl (modified) (4 diffs)

branches/eam_branches/20090715/pstamp/scripts/pstamp_job_run.pl

@@ -11 +11 @@
 use Sys::Hostname;
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
+use Carp;
 use File::Basename;
 use Digest::MD5::File qw( file_md5_hex );
@@ -137 +138 @@
     }
 } elsif ($jobType eq "get_image") {
-    my_die( "get_image jobs not working right now", $job_id, $PS_EXIT_CONFIG_ERROR);
+    my_die( "get_image jobs not working right now", $job_id, $PS_EXIT_PROG_ERROR);
 
     my $uri = "";
@@ -201 +202 @@
     my $exit_code = shift;      # Exit code to add
 
-    $exit_code = $PS_EXIT_PROG_ERROR unless defined $exit_code;
+    $exit_code = $PS_EXIT_PROG_ERROR unless $exit_code;
 
     carp($msg);
@@ -208 +209 @@
         $command .= " -job_id $job_id";
         $command .= " -fault $exit_code";
+        # XXX: fix pstamptool to not require -state when -fault with nonzero value is provided
+        $command .= " -state run";
         $command .= " -dbname $dbname" if defined $dbname;
         $command .= " -dbserver $dbserver" if defined $dbserver;