diff options
author | intrigeri <intrigeri@boum.org> | 2010-10-17 01:57:55 +0200 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2010-10-17 01:57:55 +0200 |
commit | bcfb35c969de53aa2972a9d2415be5a258a01be8 (patch) | |
tree | 9666e083c5391235f97c86032e979973ef299ee6 /manifests/default_sources_list.pp | |
parent | e2f80db7b76171e5945127e2fd42fb35043990fb (diff) | |
parent | eae01000c1db8bcfa7de17b2a9a8370289b801bc (diff) | |
download | puppet-apt-bcfb35c969de53aa2972a9d2415be5a258a01be8.tar.gz puppet-apt-bcfb35c969de53aa2972a9d2415be5a258a01be8.tar.bz2 |
Merge remote branch 'nadir/master' into wip
Conflicts:
manifests/default_preferences.pp
manifests/default_sources_list.pp
manifests/init.pp
templates/Debian/sources.list.deb-src.erb
templates/Debian/sources.list.erb
templates/Debian/sources.list.volatile.erb
templates/Ubuntu/sources.list.erb
Diffstat (limited to 'manifests/default_sources_list.pp')
-rw-r--r-- | manifests/default_sources_list.pp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/manifests/default_sources_list.pp b/manifests/default_sources_list.pp index 0e78c02..91955d7 100644 --- a/manifests/default_sources_list.pp +++ b/manifests/default_sources_list.pp @@ -4,6 +4,7 @@ class apt::default_sources_list { # additional sources could be included via an array "/etc/apt/sources.list": content => template("apt/${operatingsystem}/sources.list.erb"), + require => Package['lsb']; } } |