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

Support alternative path to emerge tool (also for wrappers).


Signed-off-by: default avatarRobin H. Johnson <robbat2@gentoo.org>
parent 4372f6bd
...@@ -50,6 +50,7 @@ class portage ( ...@@ -50,6 +50,7 @@ class portage (
$portage_utils_keywords = $portage::params::portage_utils_keywords, $portage_utils_keywords = $portage::params::portage_utils_keywords,
$portage_utils_keywords_version = $portage::params::portage_utils_keywords_version, $portage_utils_keywords_version = $portage::params::portage_utils_keywords_version,
$portage_utils_use = $portage::params::portage_utils_use, $portage_utils_use = $portage::params::portage_utils_use,
$emerge_command = $portage::params::emerge_command,
) inherits portage::params { ) inherits portage::params {
include ::portage::install include ::portage::install
...@@ -65,7 +66,7 @@ class portage ( ...@@ -65,7 +66,7 @@ class portage (
} }
exec { 'changed_makeconf': exec { 'changed_makeconf':
command => 'emerge -1 --changed-use $(qlist -vIC | sed \'s/^/=/\')', command => "${emerge_command} -1 --changed-use $(qlist -vIC | sed \'s/^/=/\')",
refreshonly => true, refreshonly => true,
timeout => 43200, timeout => 43200,
provider => shell, provider => shell,
......
...@@ -273,7 +273,7 @@ define portage::package ( ...@@ -273,7 +273,7 @@ define portage::package (
} }
exec { "rebuild_${atom}": exec { "rebuild_${atom}":
command => "emerge --changed-use -u1 ${atom}", command => "${portage::emerge_command} --changed-use -u1 ${atom}",
refreshonly => true, refreshonly => true,
timeout => 43200, timeout => 43200,
path => ['/usr/local/sbin','/usr/local/bin', path => ['/usr/local/sbin','/usr/local/bin',
......
...@@ -34,4 +34,5 @@ class portage::params { ...@@ -34,4 +34,5 @@ class portage::params {
$portage_utils_keywords = undef $portage_utils_keywords = undef
$portage_utils_keywords_version = undef $portage_utils_keywords_version = undef
$portage_utils_use = undef $portage_utils_use = undef
$emerge_command = '/usr/bin/emerge'
} }
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