Changeset 32816

Timestamp:

Nov 25, 2011, 9:00:53 AM (15 years ago)

Author:

bills

Message:

postage stamp fixes

Location:

tags/ipp-20111110/pstamp/scripts

Files:

• . (modified) (1 prop)
• pstamp_checkdependent.pl (modified) (1 diff)
• pstamp_parser_run.pl (modified) (1 diff)

tags/ipp-20111110/pstamp/scripts/pstamp_checkdependent.pl

@@ -255 +255 @@
             # caller will fault the jobs
             return $error_code;
-        } elsif ($chip->{dsRun_state} eq 'failed_revert') {
+        } elsif ($chip->{dsRun_state} =~ /failed_revert/) {
             # XXX: revert failures are rarely fixed. give up but say it's just not available not GONE 
             print "magicDSRun.state = $dsRun_state for chipRun $stage_id is in state failed_revert cannot update\n";

tags/ipp-20111110/pstamp/scripts/pstamp_parser_run.pl

@@ -89 +89 @@
     # outdir is where all of the files generated for this request are placed
     # NOTE: this location needs to be kept in sync with the web interface ( request.php )
-    my $datestr = strftime "%Y%m%d", gmtime;
+    my $datestr = strftime "%Y/%m/%d", gmtime;
     my $datedir = "$pstamp_workdir/$datestr";
     if (! -e $datedir ) {
-        mkdir $datedir or my_die( "failed to create working directory $datedir for request id $req_id", $req_id,
-            $PS_EXIT_CONFIG_ERROR);
+        my $rc = system "mkdir -p $datedir";
+        if ($rc) {
+            my $status = $rc >> 8;
+            $status = $PS_EXIT_CONFIG_ERROR if !$status;
+            my_die( "failed to create working directory $datedir for request id $req_id", $req_id,
+                $status);
+        }
     }