From 17debdc04506a2bfd4297b7620acffdbd01c9176 Mon Sep 17 00:00:00 2001
From: Fotis Gimian <fgimiansoftware@gmail.com>
Date: Tue, 4 Jun 2013 10:20:38 +1000
Subject: Made the pip package independent from the dev package in the python
 class and updated version to 1.1.1

---
 manifests/init.pp    | 5 +++++
 manifests/install.pp | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index 8e8de9e..2a9a44c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -7,6 +7,9 @@
 # [*version*]
 #  Python version to install. Default: system default
 #
+# [*pip*]
+#  Install python-pip. Default: false
+#
 # [*dev*]
 #  Install python-dev. Default: false
 #
@@ -20,6 +23,7 @@
 #
 # class { 'python':
 #   version    => 'system',
+#   pip        => true,
 #   dev        => true,
 #   virtualenv => true,
 #   gunicorn   => true,
@@ -31,6 +35,7 @@
 #
 class python (
   $version    = 'system',
+  $pip        = false,
   $dev        = false,
   $virtualenv = false,
   $gunicorn   = false
diff --git a/manifests/install.pp b/manifests/install.pp
index 6454377..9306e3a 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -17,7 +17,13 @@ class python::install {
     default => absent,
   }
 
-  package { [ $pythondev, 'python-pip' ]: ensure => $dev_ensure }
+  $pip_ensure = $python::pip ? {
+    true    => present,
+    default => absent,
+  }
+
+  package { $pythondev: ensure => $dev_ensure }
+  package { 'python-pip': ensure => $pip_ensure }
 
   $venv_ensure = $python::virtualenv ? {
     true    => present,
-- 
cgit v1.2.3