From 9c1bc0825f3ebbe8473d3691bdc8c18f31fae12b Mon Sep 17 00:00:00 2001
From: Vik Bhatti <vik@vikbhatti.com>
Date: Tue, 8 Apr 2014 13:45:33 +0100
Subject: Fixed various linting issues

---
 manifests/pip.pp          | 10 +++++-----
 manifests/requirements.pp |  2 +-
 manifests/virtualenv.pp   | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/manifests/pip.pp b/manifests/pip.pp
index 8bd21d3..98b6fac 100644
--- a/manifests/pip.pp
+++ b/manifests/pip.pp
@@ -57,7 +57,7 @@ define python::pip (
 
   $cwd = $virtualenv ? {
     'system' => '/',
-    default  => "${virtualenv}",
+    default  => $virtualenv,
   }
 
   $pip_env = $virtualenv ? {
@@ -88,8 +88,8 @@ define python::pip (
   case $ensure {
     present: {
       exec { "pip_install_${name}":
-        command     => "$pip_env --log-file ${cwd}/pip.log install $install_args ${proxy_flag} ${source}",
-        unless      => "$pip_env freeze | grep -i -e ${grep_regex}",
+        command     => "${pip_env} --log-file ${cwd}/pip.log install ${install_args} ${proxy_flag} ${source}",
+        unless      => "${pip_env} freeze | grep -i -e ${grep_regex}",
         user        => $owner,
         environment => $environment,
       }
@@ -97,8 +97,8 @@ define python::pip (
 
     default: {
       exec { "pip_uninstall_${name}":
-        command     => "echo y | $pip_env uninstall $uninstall_args ${proxy_flag} ${name}",
-        onlyif      => "$pip_env freeze | grep -i -e ${grep_regex}",
+        command     => "echo y | ${pip_env} uninstall ${uninstall_args} ${proxy_flag} ${name}",
+        onlyif      => "${pip_env} freeze | grep -i -e ${grep_regex}",
         user        => $owner,
         environment => $environment,
       }
diff --git a/manifests/requirements.pp b/manifests/requirements.pp
index 60c5b6c..010a199 100644
--- a/manifests/requirements.pp
+++ b/manifests/requirements.pp
@@ -56,7 +56,7 @@ define python::requirements (
 
   $cwd = $virtualenv ? {
     'system' => '/',
-    default  => "${virtualenv}",
+    default  => $virtualenv,
   }
 
   $pip_env = $virtualenv ? {
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
index d18fbdf..ebc75be 100644
--- a/manifests/virtualenv.pp
+++ b/manifests/virtualenv.pp
@@ -105,11 +105,11 @@ define python::virtualenv (
     }
 
     exec { "python_virtualenv_${venv_dir}":
-      command => "mkdir -p ${venv_dir} ${proxy_command} && virtualenv ${system_pkgs_flag} -p ${python} ${venv_dir} && ${venv_dir}/bin/pip --log-file ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} --upgrade pip ${distribute_pkg}",
-      user    => $owner,
-      creates => "${venv_dir}/bin/activate",
-      path    => $path,
-      cwd     => "/tmp",
+      command     => "mkdir -p ${venv_dir} ${proxy_command} && virtualenv ${system_pkgs_flag} -p ${python} ${venv_dir} && ${venv_dir}/bin/pip --log-file ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} --upgrade pip ${distribute_pkg}",
+      user        => $owner,
+      creates     => "${venv_dir}/bin/activate",
+      path        => $path,
+      cwd         => '/tmp',
       environment => $environment,
     }
 
-- 
cgit v1.2.3