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 /templates | |
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 'templates')
-rw-r--r-- | templates/Ubuntu/sources.list.erb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb index 44f3024..36fc150 100644 --- a/templates/Ubuntu/sources.list.erb +++ b/templates/Ubuntu/sources.list.erb @@ -20,3 +20,6 @@ deb-src http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-security main # backports deb http://archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-backports main universe multiverse restricted +<% if include_src then -%> +deb-src http://archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-backports main universe multiverse restricted +<% end -%> |