Changeset 30742

Timestamp:

Feb 23, 2011, 12:08:45 PM (15 years ago)

Author:

bills

Message:

Fix logic error when check states of the chips that a warp depends on. (This fixes the fix
I made yesterday).

File:

• trunk/pstamp/scripts/pstamp_checkdependent.pl (modified) (1 diff)

trunk/pstamp/scripts/pstamp_checkdependent.pl

@@ -356 +356 @@
     foreach my $chip (@$data) {
         $chip_id = $chip->{chip_id};
+
         # if chip has been magicked before require it to be magicked again
-
-         if (($chip->{data_state} ne 'full') or ($need_magic or ($chip->{magicked} < 0))) {
-            if ($chip->{magicked} < 0) {
-                print "Input has been destreaked so we must destreak before warping\n";
-                $need_magic = 1 
-            }
+        # because the warp pending query requires it.
+        if ($chip->{magicked} < 0) {
+            print "Input has been destreaked so we must destreak before warping\n";
+            $need_magic = 1 
+        }
+
+        if ($need_magic and ($chip->{magicked} eq 0)) {
+            my_die("Client requires magic, but chip never magicked. How did this dependent get queued?", $PS_EXIT_PROG_ERROR);
+        }
+
+        if (($chip->{data_state} ne 'full') or ($need_magic and ($chip->{magicked} < 0))) {
             $chips_ready = 0;
             $chip->{fault} = $chip->{chip_fault};