diff options
| author | varac <varacanero@zeromail.org> | 2010-07-15 21:22:24 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2010-07-15 21:22:24 +0200 |
| commit | 5952611119d839eea1e4b39be1c89fa2e5cae502 (patch) | |
| tree | 16073fcffb5553bd723ff849d50ac33082c4a6ac | |
| parent | 99b7fc4a95b10fb7844c3f3da1254b011986b5cc (diff) | |
| download | puppet-apt-5952611119d839eea1e4b39be1c89fa2e5cae502.tar.gz puppet-apt-5952611119d839eea1e4b39be1c89fa2e5cae502.tar.bz2 | |
fixed unclomplete merge with riseups master
| -rw-r--r-- | manifests/init.pp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 87668fd..0606182 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -113,25 +113,12 @@ class apt { ensure => latest, } -<<<<<<< HEAD - ## This package should really always be current - package { "debian-archive-keyring": - ensure => latest, - } - -======= ->>>>>>> riseup/master case $backports_enabled { 'true': { config_file { # backports -<<<<<<< HEAD "/etc/apt/sources.list.d/${operatingsystem}-backports.list": 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]; } @@ -180,7 +167,6 @@ class apt { default: { } } -<<<<<<< HEAD case $apt_deb_src_enabled { 'true': { config_file { @@ -202,9 +188,6 @@ class apt { } default: {} } -======= - ->>>>>>> riseup/master case $custom_key_dir { '': { |