Search index when staying at the latest version

mterzo · mterzo · commit cbaed3656557 · 2016-08-18T06:04:40.000-04:00
diff --git a/manifests/pip.pp b/manifests/pip.pp
@@ -125,6 +125,11 @@
       default => "--index-url=${index}",
     }
 
+  $pypi_search_index = $index ? {
+      false   => '',
+      default => "--index=${index}",
+    }
+
   $proxy_flag = $proxy ? {
     false    => '',
     default  => "--proxy=${proxy}",
@@ -242,7 +247,7 @@
         # Latest version.
         exec { "pip_install_${name}":
           command     => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${pip_env} --log ${log}/pip.log install --upgrade \$wheel_support_flag ${pypi_index} ${proxy_flag} ${install_args} ${install_editable} ${source} || ${pip_env} --log ${log}/pip.log install --upgrade ${pypi_index} ${proxy_flag} ${install_args} ${install_editable} ${source} ;}",
-          unless      => "${pip_env} search ${proxy_flag} ${source} | grep -i INSTALLED.*latest",
+          unless      => "${pip_env} search ${pypi_search_index} ${proxy_flag} ${source} | grep -i INSTALLED.*latest",
           user        => $owner,
           group       => $group,
           cwd         => $cwd,
