Fix virtualenv package installation on Debian Jessie.

olavmo-sikt · olavmo-sikt · commit 649957d07d7f · 2015-07-09T11:42:17.000+02:00
On Debian Jessie the package `python-virtualenv` no longer installes the `virtualenv` binary. Instead we must install the `virtualenv` package. See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752467 Fixes voxpupuli#194
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -27,6 +27,11 @@
     'Suse'   => "${python}-devel",
   }
 
+  $python_virtualenv = $::lsbdistcodename ? {
+    'jessie' => 'virtualenv',
+    default  => 'python-virtualenv',
+  }
+
   # pip version: use only for installation via os package manager!
   if $::python::version =~ /^3/ {
     $pip = 'python3-pip'
@@ -67,11 +72,11 @@
         if ($venv_ensure == present) and ($::operatingsystemrelease =~ /^6/) {
           if $python::use_epel == true {
             include 'epel'
-            Class['epel'] -> Package['python-virtualenv']
+            Class['epel'] -> Package[$python_virtualenv]
           }
         }
       }
-      package { 'python-virtualenv': ensure => $venv_ensure }
+      package { $python_virtualenv: ensure => $venv_ensure }
       package { $pip: ensure => $pip_ensure }
       package { $pythondev: ensure => $dev_ensure }
       package { $python: ensure => present }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,11 @@`
`27`	`27`	`'Suse' => "${python}-devel",`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ $python_virtualenv = $::lsbdistcodename ? {`
	`31`	`+ 'jessie' => 'virtualenv',`
	`32`	`+ default => 'python-virtualenv',`
	`33`	`+ }`
	`34`	`+`
`30`	`35`	`# pip version: use only for installation via os package manager!`
`31`	`36`	`if $::python::version =~ /^3/ {`
`32`	`37`	`$pip = 'python3-pip'`
`@@ -67,11 +72,11 @@`
`67`	`72`	`if ($venv_ensure == present) and ($::operatingsystemrelease =~ /^6/) {`
`68`	`73`	`if $python::use_epel == true {`
`69`	`74`	`include 'epel'`
`70`		`- Class['epel'] -> Package['python-virtualenv']`
	`75`	`+ Class['epel'] -> Package[$python_virtualenv]`
`71`	`76`	`}`
`72`	`77`	`}`
`73`	`78`	`}`
`74`		`- package { 'python-virtualenv': ensure => $venv_ensure }`
	`79`	`+ package { $python_virtualenv: ensure => $venv_ensure }`
`75`	`80`	`package { $pip: ensure => $pip_ensure }`
`76`	`81`	`package { $pythondev: ensure => $dev_ensure }`
`77`	`82`	`package { $python: ensure => present }`