Changeset 27517 for branches/eam_branches/20100225/ippScripts/scripts/diff_skycell.pl

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• ippScripts/scripts/diff_skycell.pl (modified) (2 diffs)

branches/eam_branches/20100225/ippScripts/scripts/diff_skycell.pl

@@ -170 +170 @@
         $tess_id = $file->{tess_id};
     }
-    if (defined $skycell_id) {
-        &my_die("Skycell identifiers don't match", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless
-            $file->{skycell_id} eq $skycell_id;
-    } else {
-        $skycell_id = $file->{skycell_id};
-    }
+    &my_die("Skycell identifiers don't match", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless
+        $file->{skycell_id} eq $skycell_id;
     if (defined $camera) {
         &my_die("Cameras don't match", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $file->{camera} eq $camera;
@@ -342 +338 @@
                 &my_die("Couldn't find expected output file: $inverseSources", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($inverseSources);
                 if ($run_state eq 'new') {
-                    &my_die("Couldn't find expected output file: $configuration", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($configuration);
+                    &my_die("Couldn't find expected output file: $configuration", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($configuration);
                 }
             }