Bug 394500, minor tidy ups for update staging (don't leave behind mar/*-xpi), r=coop

git-svn-id: svn://10.0.0.236/trunk@233750 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/tools/release/Bootstrap/Step/Stage.pm

@@ -390,7 +390,7 @@ sub Execute {
     find(sub { return $this->LeaveOnlyUpdateMarsCallback(); },
      catfile($stageDir, 'batch1', 'mar'));
 
-    foreach my $delDir (@{$this->{'leaveOnlyUpdateMarsDirDeleteList'}}) {
+    foreach my $delDir (@{$this->{'leaveOnlyMarsDirDeleteList'}}) {
         if (-e $delDir && -d $delDir) {
             $this->Log(msg => "rmtree() ing $delDir");
             if (rmtree($delDir, 1, 1) <= 0) {
@@ -403,12 +403,6 @@ sub Execute {
                       catfile($stageDir, 'batch1', 'mar')
                       );
 
-    $this->Shell(
-      cmd => catfile($stageHome, 'bin', 'groom-files'),
-      cmdArgs => ['--short=' . $version, '.'],
-      logFile => catfile($logDir, 'stage_groom_files_updates.log'),
-      dir => catfile($stageDir, 'batch1', 'mar'),
-    );
 }
 
 sub Verify {