diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-10-09 12:08:26 -0400 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-10-09 12:08:26 -0400 |
| commit | e4d777e5ec333c819a6b87b5c0186f67e86361ee (patch) | |
| tree | b36957b74b417e68e9c09bf5300957d2e9f4857e /manifests/params.pp | |
| parent | cc53ce119f5b9b239bc1b8cdcaae6a668b8d1f8c (diff) | |
| parent | 3a7dd605e344cd8bdfa33a1fb82bfefe948cbd00 (diff) | |
| download | puppet-apt-e4d777e5ec333c819a6b87b5c0186f67e86361ee.tar.gz puppet-apt-e4d777e5ec333c819a6b87b5c0186f67e86361ee.tar.bz2 | |
Fix merge conflict in README
Diffstat (limited to 'manifests/params.pp')
| -rw-r--r-- | manifests/params.pp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/manifests/params.pp b/manifests/params.pp index a1c7392..9c85b6f 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,5 +1,4 @@ class apt::params () { - $codename = $::lsbdistcodename $use_lts = false $use_volatile = false $use_backports = true @@ -7,7 +6,7 @@ class apt::params () { $use_next_release = false $debian_url = 'http://httpredir.debian.org/debian/' $security_url = 'http://security.debian.org/' - $backports_url = $::lsbdistcodename ? { + $backports_url = $::debian_codename ? { 'squeeze' => 'http://backports.debian.org/debian-backports/', default => $debian_url } |