Changeset 25027 for branches/pap/ippScripts/scripts/dist_component.pl

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

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

branches/pap/ippScripts/scripts/dist_component.pl

@@ -157 +157 @@
     my $image_type = get_image_type($stage, $file_rule);
 
-    # if we are building a clean bundle skip this rule
-    next if $clean && $image_type;
+    # if this is an image and we are building a clean bundle or if quality is bad skip this rule
+    next if $image_type and ($clean or $poor_quality);
 
     # if magic is required, don't ship jpegs or binned fits images
@@ -189 +189 @@
         # save the 
         if ($image_type eq 'image') {
-            $image = $path
+            $image = $file_name;
         } elsif ($image_type eq 'mask') {
-            $mask = $path;
+            $mask = $file_name;;
         } elsif ($image_type eq 'variance') {
-            $variance = $path;
+            $variance = $file_name;;
         } else {
             &my_die("invalid image type found: $image_type", $dist_id, $component,