Merge pull request voxpupuli#119 from monnerbug/virtualenv_cmd

shivapoudel · shivapoudel · commit 41878b74262e · 2014-08-26T09:09:12.000+05:45
making virtualenv command a variable to support python2.7
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
@@ -93,6 +93,11 @@
       default  => "python${version}",
     }
 
+    $virtualenv = $version ? {
+      'system' => 'virtualenv',
+      default  => "virtualenv-${version}",
+    }
+
     $proxy_flag = $proxy ? {
       false    => '',
       default  => "--proxy=${proxy}",
@@ -144,7 +149,7 @@
 
 
     exec { "python_virtualenv_${venv_dir}":
-      command     => "true ${proxy_command} && virtualenv ${system_pkgs_flag} -p ${python} ${venv_dir} && ${venv_dir}/bin/pip wheel --help > /dev/null 2>&1 && { ${venv_dir}/bin/pip wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${venv_dir}/bin/pip --log ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} \$wheel_support_flag --upgrade pip ${distribute_pkg} || ${venv_dir}/bin/pip --log ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag}  --upgrade pip ${distribute_pkg} ;}",
+      command     => "true ${proxy_command} && ${virtualenv} ${system_pkgs_flag} -p ${python} ${venv_dir} && ${venv_dir}/bin/pip wheel --help > /dev/null 2>&1 && { ${venv_dir}/bin/pip wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${venv_dir}/bin/pip --log ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} \$wheel_support_flag --upgrade pip ${distribute_pkg} || ${venv_dir}/bin/pip --log ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag}  --upgrade pip ${distribute_pkg} ;}",
       user        => $owner,
       creates     => "${venv_dir}/bin/activate",
       path        => $path,
