Changeset 23396

Timestamp:

Mar 18, 2009, 10:26:15 AM (17 years ago)

Author:

bills

Message:

remove -no-op option it doesn't make sense for this script
use disttool to manage the distRun

File:

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

trunk/ippScripts/scripts/dist_component.pl

@@ -40 +40 @@
 my ($dist_id, $camera, $stage, $stage_id, $component, $path_base, $chip_path_base, $clean);
 my ($outroot, $run_state, $data_state, $magicked);
-my ($dbname, $save_temps, $verbose, $no_update, $no_op, $logfile);
+my ($dbname, $save_temps, $verbose, $no_update, $logfile);
 
 GetOptions(
@@ -59 +59 @@
            'verbose'        => \$verbose,    # Print stuff?
            'no-update'      => \$no_update,  # Don't update the database?
-           'no-op'          => \$no_op,      # Don't do any operations?
            'logfile=s'      => \$logfile,
            ) or pod2usage( 2 );
@@ -100 +99 @@
 }
 
-
 # create the output directories if it is not a nebulous path and it doesn't exist
 if (index($outroot, "neb://") != 0) {
@@ -134 +132 @@
 foreach my $file (@$file_list) {
     my $base = basename($file);
+    my $path = $ipprc->file_resolve($file);
+    # if file is not found, just skip it.
+    # This is not always the right thing to do.
+    # For example if warpSkyfile is ignored, there won't be many of the data products
+    # the new config dump will only list the files actually produced.
+    next if !$path;
+
     push @base_list, $base;
-    my $path = $ipprc->file_resolve($file);
     symlink $path, "$tmpdir/$base";
 }
@@ -181 +185 @@
     $command .= " -chip_mask $mask" if ($stage eq 'chip' and $mask);
     $command .= " -weight $variance" if $variance;
-    unless (defined $no_op) {
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => $verbose);
-        unless ($success) {
-            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            &my_die("Unable to perform $command: $error_code", $dist_id, $component, $error_code);
-        }
-    } else {
-        print "skipping command $command\n";
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        run(command => $command, verbose => $verbose);
+    unless ($success) {
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to perform $command: $error_code", $dist_id, $component, $error_code);
     }
 }
@@ -207 +207 @@
     my $command = "tar -C $tmpdir -czhf $tarfile .";
 
-    unless (defined $no_op) {
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => $verbose);
-        unless ($success) {
-            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            &my_die("Unable to perform $command: $error_code", $dist_id, $component, $error_code);
-        }
-    } else {
-        print "skipping command $command\n";
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        run(command => $command, verbose => $verbose);
+    unless ($success) {
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to perform $command: $error_code", $dist_id, $component, $error_code);
     }
 
@@ -227 +223 @@
     $bytes = $finfo[7];
 
-    if (!$save_temps) {
-        # delete the temp directory and it's contents
-        system "rm -r $tmpdir";
-    }
+    delete_tmpdir($tmpdir);
 }
 {
@@ -342 +335 @@
     }
 
+    delete_tmpdir();
+
     carp($msg);
     exit $exit_code;
 }
 
+sub delete_tmpdir {
+    if (!$save_temps) {
+        system "rm -r $tmpdir";
+    }
+}
+
 __END__