Disable system package flag on older virtualenv

Jarl Stefansson · Jarl Stefansson · commit 176915523acd · 2013-11-01T18:20:01.000-04:00
diff --git a/lib/facter/virtualenv_version.rb b/lib/facter/virtualenv_version.rb
@@ -0,0 +1,7 @@
+require 'puppet'
+pkg = Puppet::Type.type(:package).new(:name => "virtualenv")
+Facter.add("virtualenv_version") do
+  setcode do
+    /^(\d+\.\d+\.\d+).*$/.match(pkg.retrieve[pkg.property(:ensure)])[1]
+  end
+end
diff --git 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 @@
       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 ? {

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`#`
`16`	`16`	`# [systempkgs]`
`17`	`17`	`# Copy system site-packages into virtualenv. Default: don't`
	`18`	`+# If virtualenv version < 1.7 this flag has no effect since`
	`19`	`+# the system packages were not supported`
`18`	`20`	`#`
`19`	`21`	`# [distribute]`
`20`	`22`	`# Include distribute in the virtualenv. Default: true`
`@@ -88,9 +90,12 @@`
`88`	`90`	`default => "&& export http_proxy=${proxy}",`
`89`	`91`	`}`
`90`	`92`
`91`		`- $system_pkgs_flag = $systempkgs ? {`
`92`		`- false => '',`
`93`		`- default => '--system-site-packages',`
	`93`	`+ # Virtualenv versions prior to 1.7 do not support the`
	`94`	`+ # --system-site-packages flag, default off for prior versions`
	`95`	`+ if versioncmp($::virtualenv_version,'1.7') > 0 and systempkgs == true {`
	`96`	`+ $system_pkgs_flag = '--system-site-packages',`
	`97`	`+ } else {`
	`98`	`+ $system_pkgs_flag = ''`
`94`	`99`	`}`
`95`	`100`
`96`	`101`	`$distribute_pkg = $distribute ? {`