Changeset 21435

Timestamp:

Feb 10, 2009, 11:05:52 AM (17 years ago)

Author:

bills

Message:

honor the --replace and --release flags remove automatic --release

File:

• trunk/ippScripts/scripts/magic_destreak.pl (modified) (6 diffs)

trunk/ippScripts/scripts/magic_destreak.pl

@@ -32 +32 @@
 my ($replace, $remove, $release);
 my ($dbname, $save_temps, $verbose, $no_update, $no_op, $logfile);
-
-# XXX: remove this
-$release = 1;
 
 GetOptions(
@@ -104 +101 @@
 
 #
-# parse the replace and remove arguments check for errors and set upt
+# parse the replace and remove arguments check for errors and set up
 # the appropriate paths
-if (defined($replace) and ($replace eq "F")) {
+if (defined($replace) and ($replace eq "T")) {
+    $replace = 1;
+} else {
     $replace = 0;
 }
@@ -115 +114 @@
 }
 
-if (defined($remove) and ($remove eq "F")) {
+if (defined($remove) and ($remove eq "T")) {
+    $remove = 1;
+} else {
     $remove = 0;
 }
@@ -203 +204 @@
     my $command = "$streaksremove -stage $stage -tmproot $outroot -streaks $streaks -image $image";
 
-    $command .= " -release" if $release;
-
     $command .= " -class_id $class_id" if defined $class_id;
     $command .= " -recovery $recoveryroot" if defined $recoveryroot;
@@ -212 +211 @@
     $command .= " -weight $weight" if defined $weight;
     $command .= " -skycelllist $skycell_list" if defined $skycell_list;
+    $command .= " -replace" if $replace;
+    $command .= " -remove" if $remove;
+    $command .= " -release" if $release;
     $command .= " -dbname $dbname" if defined $dbname;
     unless (defined $no_op) {
@@ -232 +234 @@
     $command   .= " -magic_ds_id $magic_ds_id";
     $command   .= " -component $component";
+    $command   .= " -setmagicked" if $replace;
     $command   .= " -backup_path_base $backup_path_base" if $backup_path_base;
     $command   .= " -recovery_path_base $recovery_path_base" if $recovery_path_base;