summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorJarl Stefansson <jarl@sdelements.com>2013-11-08 11:34:54 -0500
committerJarl Stefansson <jarl@sdelements.com>2013-11-08 11:34:54 -0500
commit56b98bc177f34fbafa292e8a339fcce3abdd939b (patch)
tree5987c8b96055763daf5d31fd5641224fe6659af8 /manifests
parent2a6f96857f44c5781733be314b92c0053ba0e9a6 (diff)
Fix system package handling for < v.1.7
Diffstat (limited to 'manifests')
-rw-r--r--manifests/virtualenv.pp4
1 files changed, 4 insertions, 0 deletions
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
index 06c342e..96d48ee 100644
--- a/manifests/virtualenv.pp
+++ b/manifests/virtualenv.pp
@@ -92,8 +92,12 @@ define python::virtualenv (
# Virtualenv versions prior to 1.7 do not support the
# --system-site-packages flag, default off for prior versions
+ # Prior to version 1.7 the default was equal to --system-site-packages
+ # and the flag --no-site-packages had to be passed to do the opposite
if (( versioncmp($::virtualenv_version,'1.7') > 0 ) and ( $systempkgs == true )) {
$system_pkgs_flag = '--system-site-packages'
+ } elif (( versioncmp($::virtualenv_version,'1.7') < { 0 ) and ( $systempkgs == false ))
+ $system_pkgs_flag = '--no-site-packages'
} else {
$system_pkgs_flag = ''
}