Added environment attribute to the pip class which allows for users to override environment variables like LD_LIBRARY_PATH and ORACLE_HOME which are needed to install packages like cx_Oracle.

fgimian · fgimian · commit 5617ad20f451 · 2013-06-03T19:43:14.000+10:00
diff --git a/manifests/pip.pp b/manifests/pip.pp
@@ -33,7 +33,8 @@
   $url        = false,
   $owner      = 'root',
   $group      = 'root',
-  $proxy      = false
+  $proxy      = false,
+  environment = []
 ) {
 
   # Parameter validation
@@ -62,6 +63,7 @@
         command     => "${virtualenv}/bin/pip install ${proxy_flag} ${source}",
         unless      => "${virtualenv}/bin/pip freeze | grep -i -e ${grep_regex}",
         user        => $owner,
+        environment => $environment,
       }
     }
 
@@ -70,6 +72,7 @@
         command     => "echo y | ${virtualenv}/bin/pip uninstall ${proxy_flag} ${name}",
         onlyif      => "${virtualenv}/bin/pip freeze | grep -i -e ${grep_regex}",
         user        => $owner,
+        environment => $environment,
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@`
`33`	`33`	`$url = false,`
`34`	`34`	`$owner = 'root',`
`35`	`35`	`$group = 'root',`
`36`		`- $proxy = false`
	`36`	`+ $proxy = false,`
	`37`	`+ environment = []`
`37`	`38`	`) {`
`38`	`39`
`39`	`40`	`# Parameter validation`
`@@ -62,6 +63,7 @@`
`62`	`63`	`command => "${virtualenv}/bin/pip install ${proxy_flag} ${source}",`
`63`	`64`	`unless => "${virtualenv}/bin/pip freeze \| grep -i -e ${grep_regex}",`
`64`	`65`	`user => $owner,`
	`66`	`+ environment => $environment,`
`65`	`67`	`}`
`66`	`68`	`}`
`67`	`69`
`@@ -70,6 +72,7 @@`
`70`	`72`	`command => "echo y \| ${virtualenv}/bin/pip uninstall ${proxy_flag} ${name}",`
`71`	`73`	`onlyif => "${virtualenv}/bin/pip freeze \| grep -i -e ${grep_regex}",`
`72`	`74`	`user => $owner,`
	`75`	`+ environment => $environment,`
`73`	`76`	`}`
`74`	`77`	`}`
`75`	`78`	`}`