opuppet/module-apt
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed unclomplete merge with riseups master

Browse source
This commit is contained in:
varac 2010-07-15 21:22:24 +02:00
parent 99b7fc4a95
commit 5952611119
1 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
manifests/init.pp
View file

@ -113,25 +113,12 @@ class apt {
ensure => latest, ensure => latest,
} }
<<<<<<< HEAD
## This package should really always be current
package { "debian-archive-keyring":
ensure => latest,
}
=======
>>>>>>> riseup/master
case $backports_enabled { case $backports_enabled {
'true': { 'true': {
config_file { config_file {
# backports # backports
<<<<<<< HEAD
"/etc/apt/sources.list.d/${operatingsystem}-backports.list": "/etc/apt/sources.list.d/${operatingsystem}-backports.list":
content => template("apt/${operatingsystem}/sources.list.backports.erb"), content => template("apt/${operatingsystem}/sources.list.backports.erb"),
=======
"/etc/apt/sources.list.d/debian-backports.list":
content => template("apt/sources.list.backports.erb"),
>>>>>>> riseup/master
require => Exec[assert_lsbdistcodename]; require => Exec[assert_lsbdistcodename];
} }
@ -180,7 +167,6 @@ class apt {
default: { } default: { }
} }
<<<<<<< HEAD
case $apt_deb_src_enabled { case $apt_deb_src_enabled {
'true': { 'true': {
config_file { config_file {
@ -202,9 +188,6 @@ class apt {
} }
default: {} default: {}
} }
=======
>>>>>>> riseup/master
case $custom_key_dir { case $custom_key_dir {
'': { '': {