Skip to content

GitLab

Unverified Commit c63cb1cb authored by Robin H. Johnson's avatar Robin H. Johnson
Browse files

package: improve emerge_command selection. 


Signed-off-by: default avatarRobin H. Johnson <robbat2@gentoo.org>
parent 0fa19a38
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
manifests/package.pp
View file @ c63cb1cb
...@@ -123,7 +123,11 @@ define portage::package ( ...@@ -123,7 +123,11 @@ define portage::package (
$accept_keywords_target = undef, $accept_keywords_target = undef,
$mask_target = undef, $mask_target = undef,
$unmask_target = undef, $unmask_target = undef,
$emerge_command = undef,
) { ) {
include ::portage::params
$_emerge_command = pick($emerge_command, $portage::emerge_command, $portage::params::emerge_command)
$atom = $ensure ? { $atom = $ensure ? {
/(present|absent|purged|held|installed|latest)/ => $name, /(present|absent|purged|held|installed|latest)/ => $name,
...@@ -279,7 +283,7 @@ define portage::package ( ...@@ -279,7 +283,7 @@ define portage::package (
$rebuild_command = $removing ? { $rebuild_command = $removing ? {
true => '/bin/true', true => '/bin/true',
false => "${portage::emerge_command} --changed-use -u1 ${atom}", false => "${_emerge_command} --changed-use -u1 ${atom}",
default => '/bin/false Should-Not-Trigger', # This should not happen. default => '/bin/false Should-Not-Trigger', # This should not happen.
} }
notify { "rebuild_${atom}_msg": notify { "rebuild_${atom}_msg":
......
metadata.json
View file @ c63cb1cb
{ {
"name": "gentoo-portage", "name": "gentoo-portage",
"version": "2.4.3", "version": "2.4.4",
"author": "Gentoo", "author": "Gentoo",
"summary": "Puppet types and providers for Gentoo portage", "summary": "Puppet types and providers for Gentoo portage",
"license": "GPL-2.0", "license": "GPL-2.0",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment