Merge pull request #211 from olavmrk/debian_jessie_support

Debian Jessie support
voxpupuli · Jul 9, 2015 · cd91a79 · cd91a79
2 parents e92de3d + f3e6330
commit cd91a79
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
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 }

diff --git a/metadata.json b/metadata.json
@@ -27,7 +27,8 @@
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,8 @@ @@
           "operatingsystem": "Debian",
           "operatingsystemrelease": [
             "6",
-            "7"
+            "7",
+            "8"
           ]
         },
         {
@@ Expand Down @@