diff options
Diffstat (limited to 'Tools/Scripts/webkitpy/common/system/autoinstall.py')
| -rwxr-xr-x | Tools/Scripts/webkitpy/common/system/autoinstall.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Tools/Scripts/webkitpy/common/system/autoinstall.py b/Tools/Scripts/webkitpy/common/system/autoinstall.py index f3045f86b..9d1f8cb2f 100755 --- a/Tools/Scripts/webkitpy/common/system/autoinstall.py +++ b/Tools/Scripts/webkitpy/common/system/autoinstall.py @@ -146,7 +146,7 @@ class AutoInstaller(object): # The tempfile.mkdtemp() method function requires that the # directory corresponding to the "dir" parameter already exist # if it is not None. - scratch_dir = tempfile.mkdtemp(prefix=prefix, dir=self._temp_dir) + scratch_dir = tempfile.mkdtemp(prefix=prefix.replace('/', '.'), dir=self._temp_dir) return scratch_dir def _create_scratch_directory(self, target_name): @@ -337,7 +337,7 @@ class AutoInstaller(object): if os.path.exists(target_path): if os.path.isdir(target_path): - shutil.rmtree(target_path) + shutil.rmtree(target_path, ignore_errors=True) else: os.remove(target_path) @@ -408,7 +408,7 @@ class AutoInstaller(object): % (target_name, target_path, err)) raise Exception(message) finally: - shutil.rmtree(scratch_dir) + shutil.rmtree(scratch_dir, ignore_errors=True) _log.debug('Auto-installed %s to:' % url) _log.debug(' "%s"' % target_path) return True |