Merge with 0.7.80.8b7

3 files changed, 18 insertions, 1 deletions

diff --git a/.hgtags b/.hgtags
index 816334d2..4d6efc98 100644
--- a/.hgtags
+++ b/.hgtags
@@ -76,3 +76,5 @@ cae9127e0534fc46d7ddbc11f68dc88fd9311459 0.6.48
 1506fa538fff01e70424530a32a44e070720cf3c 0.7.7
 5679393794978a1d3e1e087472b8a0fdf3d8423c 0.8b5
 26f59ec0f0f69714d28a891aaad048e3b9fcd6f7 0.8b6
+f657df1f1ed46596d236376649c99a470662b4ba 0.6.49
+236de1de68b14230036147c7c9e7c09b215b53ee 0.7.8
diff --git a/CHANGES.txt b/CHANGES.txt
index 35a0b7ce..bec396bd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,12 @@ CHANGES
   conversion.
 
 -----
+0.7.8
+-----
+
+* Distribute #375: Yet another fix for yet another regression.
+
+-----
 0.7.7
 -----
 
@@ -83,6 +89,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 bbc2f09a..36a0e6ed 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1018,13 +1018,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