From: James Turnbull <james@lovedthanlost.net>
Date: Wed, 23 May 2012 17:16:49 +0000 (-0700)
Subject: Merge pull request #60 from branan/ppa_filename
X-Git-Tag: 0.0.4~10
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=efb2ed209441c2bb08245e212a53c9dab80c7ffe;hp=64e1bf9a2f90e3546de11bf2a3375bb530e561ea;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #60 from branan/ppa_filename

(#14657) Fix filename when there is a period in the PPA
---

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 64c65bb..6b38e52 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -12,8 +12,9 @@ define apt::ppa(
     fail('lsbdistcodename fact not available: release parameter required')
   }
 
-  $filename_without_slashes = regsubst($name,'/','-','G')
-  $filename_without_ppa     = regsubst($filename_without_slashes, '^ppa:','','G')
+  $filename_without_slashes = regsubst($name, '/', '-', G)
+  $filename_without_dots    = regsubst($filename_without_slashes, '\.', '_', G)
+  $filename_without_ppa     = regsubst($filename_without_dots, '^ppa:', '', G)
   $sources_list_d_filename  = "${filename_without_ppa}-${release}.list"
 
   if ! defined(Package['python-software-properties']) {