Adjust Swarm File Deletion

scripts/slave/run_slavelastic.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # run_slavelastic.py: Runs a test based off of a slavelastic manifest file.
 
 from __future__ import with_statement
+import glob
 import json
 import optparse
 import os
 import socket
-import shutil
 import sys
 import time
 import urllib
 import urllib2
 import zipfile
 
 
 DESCRIPTION = """This script takes a slavelastic manifest file, packages it,
 and sends a swarm manifest file to the swarm server.  This is expected to be
 called as a build step with the cwd as the parent of the src/ directory.
@@ skipping 180 matching lines @@
   if not options.os_image:
     parser.error('Must specify an os image')
   if not options.hashtable_dir:
     parser.error('Must specify the hashtable directory')
   if not options.data_dest_dir:
     parser.error('Must specify the server directory')
 
   # Remove the old data if there is any
   if os.path.isdir(options.data_dest_dir):
     print 'Removing old swarm files...'
-    shutil.rmtree(options.data_dest_dir)
+    for filename in glob.glob('swarm_tempfile_*.zip'):
+      os.remove(filename)
 
   # Send off the swarm test requests.
   highest_exit_code = 0
   for filename in args:
     highest_exit_code = max(highest_exit_code,
                             ProcessManifest(filename, options))
 
   return highest_exit_code
 
 
 if __name__ == '__main__':
   sys.exit(main())