Index: trunk/ippScripts/scripts/automate_stacks.pl
===================================================================
--- trunk/ippScripts/scripts/automate_stacks.pl	(revision 28827)
+++ trunk/ippScripts/scripts/automate_stacks.pl	(revision 28875)
@@ -1046,5 +1046,5 @@
     my $args = $command;
     if ((exists($clean_alternate{$mode})) && ($clean_alternate{$mode} eq 'A')) {
-	$args .= " -dbname $dbname -updaterun -set_state goto_cleaned -full -set_label goto_cleaned -time_stamp_end $cleaning_date ";
+	$args .= " -dbname $dbname -updaterun -set_state goto_cleaned -full -set_label goto_cleaned -label $label -time_stamp_end $cleaning_date ";
     }
     elsif ((exists($clean_alternate{$mode})) && ($clean_alternate{$mode} eq 'B')) {
@@ -1065,21 +1065,21 @@
 
     foreach my $mode (@mode_list) {
-	if ((exists($clean_alternate{$mode})) && ($clean_alternate{$mode} eq 'A')) {
-	    my ($cleaning_date,$command) = construct_cleantool_args($date,"",$mode);
-	    if ($cleaning_date eq 'no clean') {
-		next;
-	    }
-	    print STDERR "$command\n";
-	    if (!(defined($pretend) || $debug == 1)) {
-#           print STDERR "BEAR IS DRIVING!?\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 cleantool ($command): $error_code", 0,0,$date, $PS_EXIT_SYS_ERROR);
-		}
-	    }
-	}
-	else {
+# 	if ((exists($clean_alternate{$mode})) && ($clean_alternate{$mode} eq 'A')) {
+# 	    my ($cleaning_date,$command) = construct_cleantool_args($date,"",$mode);
+# 	    if ($cleaning_date eq 'no clean') {
+# 		next;
+# 	    }
+# 	    print STDERR "$command\n";
+# 	    if (!(defined($pretend) || $debug == 1)) {
+# #           print STDERR "BEAR IS DRIVING!?\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 cleantool ($command): $error_code", 0,0,$date, $PS_EXIT_SYS_ERROR);
+# 		}
+# 	    }
+# 	}
+# 	else {
 	    foreach my $target (@target_list) {
 		if (exists($noclean_list{$target})) {
@@ -1101,5 +1101,5 @@
 		}
 	    }
-	}
+# 	}
     }
     return(0);