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
58b8c638
Unverified
Commit
58b8c638
authored
Oct 10, 2017
by
Robin H. Johnson
Browse files
package: Validate emerge_command for future error handling.
Signed-off-by:
Robin H. Johnson
<
robbat2@gentoo.org
>
parent
c63cb1cb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
manifests/package.pp
manifests/package.pp
+3
-5
metadata.json
metadata.json
+1
-1
No files found.
manifests/package.pp
View file @
58b8c638
...
@@ -125,9 +125,10 @@ define portage::package (
...
@@ -125,9 +125,10 @@ define portage::package (
$unmask_target
=
undef
,
$unmask_target
=
undef
,
$emerge_command
=
undef
,
$emerge_command
=
undef
,
)
{
)
{
include
::portage::params
include
::portage::params
$_emerge_command
=
pick
(
$emerge_command
,
$portage::emerge_command
,
$portage::params::emerge_command
)
$_emerge_command
=
pick
(
$emerge_command
,
$portage::emerge_command
,
$portage::params::emerge_command
)
validate_re
(
$_emerge_command
,
'^/'
,
'emerge_command must start with an absolute path'
)
$atom
=
$ensure
?
{
$atom
=
$ensure
?
{
/
(
present|absent|purged|held|installed|latest
)
/
=>
$name
,
/
(
present|absent|purged|held|installed|latest
)
/
=>
$name
,
...
@@ -286,14 +287,11 @@ define portage::package (
...
@@ -286,14 +287,11 @@ define portage::package (
false
=>
"
${_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"
:
message
=>
"rebuild_command=
${rebuild_command}
"
,
withpath
=>
true
,
}
exec
{
"rebuild_
${atom}
"
:
exec
{
"rebuild_
${atom}
"
:
command
=>
$rebuild_command
,
command
=>
$rebuild_command
,
refreshonly
=>
true
,
refreshonly
=>
true
,
timeout
=>
43200
,
timeout
=>
43200
,
# Emerge inherits the path, so it must be valid.
path
=>
[
'/usr/local/sbin'
,
'/usr/local/bin'
,
path
=>
[
'/usr/local/sbin'
,
'/usr/local/bin'
,
'/usr/sbin'
,
'/usr/bin'
,
'/sbin'
,
'/bin'
],
'/usr/sbin'
,
'/usr/bin'
,
'/sbin'
,
'/bin'
],
}
}
...
...
metadata.json
View file @
58b8c638
{
{
"name"
:
"gentoo-portage"
,
"name"
:
"gentoo-portage"
,
"version"
:
"2.4.
4
"
,
"version"
:
"2.4.
5
"
,
"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"
,
...
...
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