diff options
| author | varac <varacanero@zeromail.org> | 2013-01-30 16:47:30 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-01-30 16:47:30 +0100 |
| commit | 6c135ea7bc2ae9951154cf5471801469e3e3d581 (patch) | |
| tree | 11edc63e26ce79f4e6ba2634d42c0796797f3236 /manifests/sources_list.pp | |
| parent | 92d2d7be5f99920c67245d02c1ce76288967db62 (diff) | |
| parent | 14670466be5eceba043e697d5f6f0f0ada9d5b07 (diff) | |
| download | puppet-apt-6c135ea7bc2ae9951154cf5471801469e3e3d581.tar.gz puppet-apt-6c135ea7bc2ae9951154cf5471801469e3e3d581.tar.bz2 | |
Merge remote-tracking branch 'remotes/shared/master'
Diffstat (limited to 'manifests/sources_list.pp')
| -rw-r--r-- | manifests/sources_list.pp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/manifests/sources_list.pp b/manifests/sources_list.pp index 499116d..3367f83 100644 --- a/manifests/sources_list.pp +++ b/manifests/sources_list.pp @@ -1,14 +1,16 @@ define apt::sources_list ( $ensure = 'present', $source = '', - $content = undef ) -{ + $content = undef +) { - if $source == '' and $content == undef { - fail("One of \$source or \$content must be specified for apt_sources_snippet ${name}") - } - if $source != '' and $content != undef { - fail("Only one of \$source or \$content must specified for apt_sources_snippet ${name}") + if $ensure == 'present' { + if $source == '' and $content == undef { + fail("One of \$source or \$content must be specified for apt_sources_snippet ${name}") + } + if $source != '' and $content != undef { + fail("Only one of \$source or \$content must specified for apt_sources_snippet ${name}") + } } include apt::dot_d_directories @@ -18,7 +20,7 @@ define apt::sources_list ( # apparently doesn't. file { "/etc/apt/sources.list.d/${name}": ensure => $ensure, - owner => root, group => 0, mode => 0644, + owner => root, group => 0, mode => '0644', notify => Exec['refresh_apt'], } |