From cae38f0e5e90134d997ea28b926c47ac6e7f8d6b Mon Sep 17 00:00:00 2001
From: James Shubin <james@shubin.ca>
Date: Tue, 29 Apr 2014 04:53:56 -0400
Subject: Make argparse optional on platforms where it is built into python.

---
 manifests/xml.pp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/manifests/xml.pp b/manifests/xml.pp
index cad6e88..83bdfdb 100644
--- a/manifests/xml.pp
+++ b/manifests/xml.pp
@@ -19,13 +19,18 @@ class gluster::xml {
 	include gluster::vardir
 	include gluster::params
 
-	package { "${::gluster::params::package_python_argparse}":
-		ensure => present,
+	# argparse is built into python on new platforms and isn't needed here!
+	if "${::gluster::params::package_python_argparse}" != '' {
+		package { "${::gluster::params::package_python_argparse}":
+			ensure => present,
+			before => File["${vardir}/xml.py"],
+		}
 	}
 
 	# for parsing gluster xml output
 	package { "${::gluster::params::package_python_lxml}":
 		ensure => present,
+		before => File["${vardir}/xml.py"],
 	}
 
 	#$vardir = $::gluster::vardir::module_vardir	# with trailing slash
@@ -38,11 +43,7 @@ class gluster::xml {
 		mode => 700,			# u=rwx
 		backup => false,		# don't backup to filebucket
 		ensure => present,
-		require => [
-			Package["${::gluster::params::package_python_argparse}"],
-			Package["${::gluster::params::package_python_lxml}"],
-			File["${vardir}/"],
-		],
+		require => File["${vardir}/"],
 	}
 }
 
-- 
cgit