Changeset 11050

Timestamp:

Jan 11, 2007, 3:51:18 PM (19 years ago)

Author:

jhoblitt

Message:

attempt to revise fault handling to match the 'new' p0tool semantics

File:

• trunk/ippScripts/scripts/phase0_imfile.pl (modified) (3 diffs)

trunk/ippScripts/scripts/phase0_imfile.pl

@@ -85 +85 @@
 # Look for programs we need
 my $missing_tools;
-my $p0tool = can_run('p0tool') or (warn "Can't find p0tool" and $missing_tools = 1);
-my $ppStats = can_run('ppStats') or (warn "Can't find ppStats" and $missing_tools = 1);
+my $p0tool = can_run('p0tool')
+    or (warn "Can't find p0tool" and $missing_tools = 1);
+my $ppStats = can_run('ppStats')
+    or (warn "Can't find ppStats" and $missing_tools = 1);
 
 if ($missing_tools) { 
     warn ("Can't find required tools");
-    &my_die ("", "", $PS_EXIT_CONFIG_ERROR); 
+    exit($PS_EXIT_CONFIG_ERROR); 
 }
 
@@ -183 +185 @@
 
     unless ($success) {
-        # XXX this is tricky: if we can't run -updateimfile, can we actually set the error code?
-        # XXX if this is not a database error, it is probably a programming error (in p0tool or the passed args)
-        warn ("Unable to perform p0tool -updateimfile: $error_code");
-        &my_die ($exp_tag, $class_id, $error_code);
+        # XXX if we can't run -addprocessedimfile, we can't actually set the
+        # error code.
+        # XXX if this is not a database error, it is probably a
+        # programming error (in p0tool or the passed args)
+        warn ("Unable to perform p0tool -addprocessedimfile: $error_code");
+        exit($error_code);
     }
 }
@@ -210 +214 @@
     my $exit_code = $_[2];
     if ($exp_tag && $class_id) {
-        system ("$p0tool -faultimfile -exp_tag $exp_tag -class_id $class_id -code $exit_code");
+        system ("$p0tool -addprocessedimfile -exp_tag $exp_tag -class_id $class_id -code $exit_code");
     }
     exit $exit_code;