From 176915523acd5ddd88de187426966b0d9ffb5f4b Mon Sep 17 00:00:00 2001
From: Jarl Stefansson <jarl@sdelements.com>
Date: Fri, 1 Nov 2013 18:20:01 -0400
Subject: Disable system package flag on older virtualenv

---
 manifests/virtualenv.pp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'manifests')

diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
index bdcfc6f..fc46c72 100644
--- a/manifests/virtualenv.pp
+++ b/manifests/virtualenv.pp
@@ -15,6 +15,8 @@
 #
 # [*systempkgs*]
 #  Copy system site-packages into virtualenv. Default: don't
+#  If virtualenv version < 1.7 this flag has no effect since
+#  the system packages were not supported
 #
 # [*distribute*]
 #  Include distribute in the virtualenv. Default: true
@@ -88,9 +90,12 @@ define python::virtualenv (
       default => "&& export http_proxy=${proxy}",
     }
 
-    $system_pkgs_flag = $systempkgs ? {
-      false    => '',
-      default  => '--system-site-packages',
+    # Virtualenv versions prior to 1.7 do not support the 
+    # --system-site-packages flag, default off for prior versions
+    if versioncmp($::virtualenv_version,'1.7') > 0 and systempkgs == true {
+      $system_pkgs_flag = '--system-site-packages',
+    } else {
+      $system_pkgs_flag = ''
     }
 
     $distribute_pkg = $distribute ? {
-- 
cgit v1.2.3