summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2014-01-14 15:25:38 +0100
committerFranz Pletz <fpletz@fnordicwalking.de>2014-01-14 15:31:21 +0100
commitcfcc3781d49239834d7bb91e7c2ec3c08c982a13 (patch)
tree7dd2e8365b9fa59ff9338f56dc149567bbbd12f4 /manifests
parent743c57790affea2694f2553ff66920ef543411ac (diff)
Wheel support in pip needs current setuptools
When virtualenvs are used without distribute and an old setuptools python package is installed in the system, upgrading pip in the virtualenv won't ensure setuptools > 0.8 is installed which is required by the pip wheel command. This patch upgrades setuptools if distribute isn't used. Signed-off-by: Franz Pletz <fpletz@fnordicwalking.de>
Diffstat (limited to 'manifests')
-rw-r--r--manifests/virtualenv.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
index fc540a8..a7a2bcb 100644
--- a/manifests/virtualenv.pp
+++ b/manifests/virtualenv.pp
@@ -112,7 +112,7 @@ define python::virtualenv (
$distribute_pkg = $distribute ? {
true => 'distribute',
- default => '',
+ default => 'setuptools',
}
$pypi_index = $index ? {
false => '',