diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-07-04 22:05:36 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-07-04 22:05:36 -0400 |
| commit | c54ca820504e875d33eebd58813e6c4e5ae6e3ec (patch) | |
| tree | 7cc4bc9073bcfc3acba23a4731e5d0092dde294a | |
| parent | 83c974c56ebc4689171913da1a6af3249b56ec6d (diff) | |
| parent | d19a508528b019abbd41e88fa823677ae2f60560 (diff) | |
| download | external_python_setuptools-c54ca820504e875d33eebd58813e6c4e5ae6e3ec.tar.gz external_python_setuptools-c54ca820504e875d33eebd58813e6c4e5ae6e3ec.tar.bz2 external_python_setuptools-c54ca820504e875d33eebd58813e6c4e5ae6e3ec.zip | |
Merge with Distribute 0.6.49
--HG--
rename : distribute_setup.py => ez_setup.py
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | CHANGES.txt | 8 | ||||
| -rw-r--r-- | pkg_resources.py | 3 |
3 files changed, 11 insertions, 1 deletions
@@ -70,3 +70,4 @@ ee2c967017024197b38e39ced852808265387a4b 0.6.47 48d3d26cbea68e21c96e51f01092e8fdead5cd60 0.7.6 cae9127e0534fc46d7ddbc11f68dc88fd9311459 0.6.48 1506fa538fff01e70424530a32a44e070720cf3c 0.7.7 +f657df1f1ed46596d236376649c99a470662b4ba 0.6.49 diff --git a/CHANGES.txt b/CHANGES.txt index b9a9e9f0..1a47f4db 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -76,6 +76,14 @@ Added several features that were slated for setuptools 0.6c12: * Issue #3: Fixed NameError in SSL support. ------ +0.6.49 +------ + +* Move warning check in ``get_cache_path`` to follow the directory creation + to avoid errors when the cache path does not yet exist. Fixes the error + reported in #375. + +------ 0.6.48 ------ diff --git a/pkg_resources.py b/pkg_resources.py index eb351103..bdd738f2 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -987,13 +987,14 @@ variable to point to an accessible directory. extract, as it tracks the generated names for possible cleanup later. """ extract_path = self.extraction_path or get_default_cache() - self._warn_unsafe_extraction_path(extract_path) target_path = os.path.join(extract_path, archive_name+'-tmp', *names) try: _bypass_ensure_directory(target_path) except: self.extraction_error() + self._warn_unsafe_extraction_path(extract_path) + self.cached_files[target_path] = 1 return target_path |