Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Nest
Forks
Puppet Portage
Commits
10d3069e
Unverified
Commit
10d3069e
authored
Feb 08, 2017
by
Robin H. Johnson
Browse files
Support alternative path to emerge tool (also for wrappers).
Signed-off-by:
Robin H. Johnson
<
robbat2@gentoo.org
>
parent
4372f6bd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
manifests/init.pp
manifests/init.pp
+2
-1
manifests/package.pp
manifests/package.pp
+1
-1
manifests/params.pp
manifests/params.pp
+1
-0
No files found.
manifests/init.pp
View file @
10d3069e
...
@@ -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
,
...
...
manifests/package.pp
View file @
10d3069e
...
@@ -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'
,
...
...
manifests/params.pp
View file @
10d3069e
...
@@ -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'
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment