diff options
author | varac <varacanero@zeromail.org> | 2013-03-03 09:26:49 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2013-03-03 09:26:49 +0100 |
commit | e596bfb9306664ab4aef78bc05615904b7c6e7f2 (patch) | |
tree | d9759fedf3bdfdb4a4cd3aac1e3747abbeaacbd3 /manifests/sources_list.pp | |
parent | 08b066db441375d1613d131767cb1c5bdd3bb60b (diff) | |
parent | d51e2af9d452731f63b2fe16391e9cd2ff9d640f (diff) | |
download | puppet-apt-e596bfb9306664ab4aef78bc05615904b7c6e7f2.tar.gz puppet-apt-e596bfb9306664ab4aef78bc05615904b7c6e7f2.tar.bz2 |
Merge remote-tracking branch 'remotes/origin/master' into nadir_master
Conflicts:
README
files/50unattended-upgrades
files/lenny/50unattended-upgrades
files/squeeze/50unattended-upgrades
manifests/dist_upgrade.pp
manifests/init.pp
manifests/upgrade_package.pp
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'], } |