Merge pull request #5 from ripcurld00d/bugfix

seocam · seocam · commit 4def2faecf4d · 2015-05-18T14:43:38.000-03:00
Fix the 'index-url' and the 'install' bugs
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -15,7 +15,7 @@
     present, installed: {
       $index_url_arg = $index_url ? {
         undef    => '',
-        defaults => "--index_url=${index_url}",
+        default => "--index-url=${index_url}",
       }
 
       if $version != undef {
@@ -29,6 +29,7 @@
       exec { "install-${package}":
         command => "pip${python_version} install ${index_url_arg} ${package_with_version}",
         unless  => "pip${python_version} freeze | grep '${grep_for}'",
+        require => Exec["install-pip${python_version}"],
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`present, installed: {`
`16`	`16`	`$index_url_arg = $index_url ? {`
`17`	`17`	`undef => '',`
`18`		`- defaults => "--index_url=${index_url}",`
	`18`	`+ default => "--index-url=${index_url}",`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`if $version != undef {`
`@@ -29,6 +29,7 @@`
`29`	`29`	`exec { "install-${package}":`
`30`	`30`	`command => "pip${python_version} install ${index_url_arg} ${package_with_version}",`
`31`	`31`	`unless => "pip${python_version} freeze \| grep '${grep_for}'",`
	`32`	`+ require => Exec["install-pip${python_version}"],`
`32`	`33`	`}`
`33`	`34`	`}`
`34`	`35`