summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2012-05-18 15:45:07 -0400
committerJason R. Coombs <jaraco@jaraco.com>2012-05-18 15:45:07 -0400
commit4e867cca82f344786a567d8c5d65dd93f48b7e41 (patch)
treea60aaeddcac176bfe45eb3372848bd3a4a06bd4b
parentc0cb2ebfddabb15027a036d82702977cb9444651 (diff)
parentb35960c77a05217ed4db1e7e9ec86570f4e9b6dc (diff)
downloadpython-setuptools-git-4e867cca82f344786a567d8c5d65dd93f48b7e41.tar.gz
Merge0.6.27
--HG-- branch : distribute extra : rebase_source : ecff80ba26dd674d1281d70e868f7ca907fd0047
-rw-r--r--CHANGES.txt2
-rw-r--r--distribute_setup.py3
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 654aacf1..2707f01c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,8 @@ CHANGES
* Distribute now recognizes README.rst as a standard, default readme file.
* Exclude 'encodings' modules when removing modules from sys.modules.
Workaround for #285.
+* Issue #231: Don't fiddle with system python when used with buildout
+ (bootstrap.py)
------
0.6.26
diff --git a/distribute_setup.py b/distribute_setup.py
index ba46350d..b8c4a11d 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -306,6 +306,9 @@ def _create_fake_setuptools_pkg_info(placeholder):
log.warn('%s already exists', pkg_info)
return
+ if not os.access(pkg_info, os.W_OK):
+ log.warn("Don't have permissions to write %s, skipping", pkg_info)
+
log.warn('Creating %s', pkg_info)
f = open(pkg_info, 'w')
try: