Changeset 23295 for trunk/ippScripts/scripts/dist_component.pl

Timestamp:

Mar 12, 2009, 11:38:13 AM (17 years ago)

Author:

Paul Price

Message:

Set error code to PROG_ERROR if not already set --- avoids infinite pantasks loops.

File:

• trunk/ippScripts/scripts/dist_component.pl (modified) (4 diffs)

trunk/ippScripts/scripts/dist_component.pl

@@ -122 +122 @@
 if (-e $tmpdir) {
     if (-d $tmpdir) {
-        my $rc = system "rm -r $tmpdir"; 
+        my $rc = system "rm -r $tmpdir";
         &my_die("cannot rm $tmpdir return code: $rc", $dist_id, $component, $PS_EXIT_UNKNOWN_ERROR) if $rc;
     } else {
@@ -272 +272 @@
         my $clean_mdc = join "", @data;
 
-        my $mdlist = $mdcParser->parse($clean_mdc) or 
+        my $mdlist = $mdcParser->parse($clean_mdc) or
                 &my_die("failed to parse clean.mdc", $dist_id, $component, $PS_EXIT_UNKNOWN_ERROR);
 
@@ -293 +293 @@
             next if $rule eq "STAGE";
             my $keep_on_clean = $product_list->{$rule};
-            my $fn = $ipprc->filename($rule, $path_base, $component) or 
-                &my_die("Missing entry from camera config: $rule", $dist_id, $component, 
+            my $fn = $ipprc->filename($rule, $path_base, $component) or
+                &my_die("Missing entry from camera config: $rule", $dist_id, $component,
                     $PS_EXIT_CONFIG_ERROR);
     #        printf "%-16.16s\t%s\t%s\n",  $rule, $clean, $fn;
@@ -323 +323 @@
     my $exit_code = shift;      # Exit code to add
 
+    $exit_code = $PS_EXIT_PROG_ERROR unless defined $exit_code;
+
     my $command = "$disttool -addprocessedcomponent";
     $command   .= " -dist_id $dist_id";