Changeset 43052 for branches/eam_branches/ipp-pstamp-20260421/pstamp/scripts/psmkreq

Timestamp:

Jun 12, 2026, 2:47:49 PM (5 weeks ago)

Author:

eugene

Message:

convert the IPC::Cmd run calls to ps_run to handle inconsistent behavior between IPC:Cmd versions pre- and post-0.40

File:

• branches/eam_branches/ipp-pstamp-20260421/pstamp/scripts/psmkreq (modified) (3 diffs)

branches/eam_branches/ipp-pstamp-20260421/pstamp/scripts/psmkreq

@@ -12 +12 @@
 use Getopt::Long qw( GetOptions ) ; # :config auto_help auto_version gnu_getopt );
 use Pod::Usage qw( pod2usage );
-use PS::IPP::Config qw( :standard );
+use PS::IPP::Config qw( :standard ps_run );
 use PS::IPP::PStamp::RequestFile qw( :standard );
 use PS::IPP::PStamp::Job qw( :standard );
 use File::Temp qw(tempfile);
 use File::Basename qw(basename);
-use Scalar::Util qw(looks_like_number);
-use IPC::Cmd 0.36 qw( can_run run );
+use IPC::Cmd 0.36 qw( can_run );
 use Carp;
 use POSIX;
@@ -296 +295 @@
     my $command = "$pstamp_request_file --input $table_def_name --req_name $req_name";
     $command .= " --output $output" if $output;
-    my ( $success, $error_msg, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
-    my $error_code = &parse_error_message ($success, $error_msg, $command);
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        ps_run(command => $command, verbose => $verbose);
     unless ($success) {
         print STDERR @$stderr_buf;
-        exit $error_code;
+        exit $error_code >>8;
     }
 }
@@ -450 +448 @@
 }
 
-# if the program exited normally, the exit value is returned
-# if the program exited with a signal (abort, crash, etc), PS_EXIT_PROG_ERROR (4) is returned
-# if the program failed to run, -PS_EXIT_PROG_ERROR (-4) is returned
-sub parse_error_message {
-    my $success = shift;
-    my $error_msg = shift;
-    my $command = shift;
-
-    if ($success) { return 0; }
-
-    print "raw error_msg: $error_msg\n";
-    print "full command: $command\n";
-
-    if (&looks_like_number($error_msg)) { return (($error_msg >> 8) or ($PS_EXIT_PROG_ERROR)); }
-        
-    # which of these match?
-    my ($error_code) = $error_msg =~ m/exited with value (\d+)/;
-    if (defined $error_code) { return $error_code; }
-    
-    ($error_code) = $error_msg =~ m/died with signal (\d+)/;
-#   if (defined $error_code) { return (128 + $error_code); }
-    if (defined $error_code) { return ($PS_EXIT_PROG_ERROR); }
-    
-    # probably failed to execute:
-    return (-1*$PS_EXIT_PROG_ERROR);
-}
-