Merge pull request #368 from sdodson/bz1170859

sdodson · sdodson · commit 964be18dd431 · 2014-12-12T11:29:12.000-05:00
BZ1170859 - Only install recommended deps for installed cartridges
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -981,7 +981,7 @@
   }
 
   $cartridge_deps_to_install = $install_cartridges_recommended_deps ? {
-    undef   => $cartridge_deps_to_install_default,
+    undef   => intersection($cartridge_deps_to_install_default, $cartridges_to_install),
     default => $install_cartridges_recommended_deps,
   }
 

Original file line number	Diff line number	Diff line change
`@@ -981,7 +981,7 @@`
`981`	`981`	`}`
`982`	`982`
`983`	`983`	`$cartridge_deps_to_install = $install_cartridges_recommended_deps ? {`
`984`		`- undef => $cartridge_deps_to_install_default,`
	`984`	`+ undef => intersection($cartridge_deps_to_install_default, $cartridges_to_install),`
`985`	`985`	`default => $install_cartridges_recommended_deps,`
`986`	`986`	`}`
`987`	`987`