Changeset 29052

Timestamp:

Aug 25, 2010, 2:34:20 PM (16 years ago)

Author:

bills

Message:

if $need_magic and chipRun has no magicDSRun (never magicked) fault the jobs depending
on that dependent

File:

• trunk/pstamp/scripts/pstamp_checkdependent.pl (modified) (2 diffs)

trunk/pstamp/scripts/pstamp_checkdependent.pl

@@ -644 +644 @@
     # if the input file is already magicked no need to queue destreaking for this chipRun
     if ($need_magic and !$input_magicked) {
-        if ($dsRun_state eq 'cleaned') {
+        if (!defined($dsRun_state) or ($dsRun_state eq 'NULL')) {
+            print "No magicDSRun for chipRun $stage_id and magic is required\n";
+            faultJobs('stop', undef, undef, $PSTAMP_NOT_DESTREAKED);
+        } elsif ($dsRun_state eq 'cleaned') {
             my $command = "$magicdstool -updaterun -set_state new -stage $stage -stage_id $stage_id";
             $command .= " -set_label $rlabel" if $rlabel;
@@ -658 +661 @@
             }
         } elsif ($dsRun_state eq 'failed_revert') {
-            print "magicDSRun.state = $dsRun_state for chipRun $stage_id is in state failed_revert cannot update";
+            print "magicDSRun.state = $dsRun_state for chipRun $stage_id is in state failed_revert cannot update\n";
             faultJobs('stop', undef, undef, $PSTAMP_NOT_AVAILABLE);
         } else {