Merge branch 'release/6.0.5'

msabramo · Jan 3, 2015 · 98b6e25 · 98b6e25
2 parents cf86cd8 + 1df7c45
commit 98b6e25
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,9 @@
+**6.0.5 (2015-01-03)**
+
+* Fix a regression with 6.0.4 under Windows where most commands would raise an
+  exception due to Windows not having the ``os.geteuid()`` function.
+
+
 **6.0.4 (2015-01-03)**
 
 * Fix an issue where ANSI escape codes would be used on Windows even though the

diff --git a/pip/__init__.py b/pip/__init__.py
@@ -30,7 +30,7 @@
 cmdoptions = pip.cmdoptions
 
 # The version as used in the setup.py and the docs conf.py
-__version__ = "6.0.4"
+__version__ = "6.0.5.dev0"
 
 
 logger = logging.getLogger(__name__)

diff --git a/pip/utils/filesystem.py b/pip/utils/filesystem.py
@@ -1,9 +1,15 @@
+import os
 import os.path
 
 from pip.compat import get_path_uid
 
 
 def check_path_owner(path, uid):
+    # If we don't have a way to check the effective uid of this process, then
+    # we'll just assume that we own the directory.
+    if not hasattr(os, "geteuid"):
+        return True
+
     previous = None
     while path != previous:
         if os.path.lexists(path):