Cleaned up unit tests.

[puppet-modules/puppetlabs-apt.git] / manifests / ppa.pp

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index f9296549ac4e44bd623f5794d2bfa7ffd950ad57..5f5c6ae57421993afa99705d3d63b6de081fd066 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -3,7 +3,7 @@
 define apt::ppa(
   $ensure  = 'present',
   $release = $::lsbdistcodename,
-  $options = '-y'
+  $options = $apt::params::ppa_options,
 ) {
   include apt::params
   include apt::update
@@ -14,6 +14,10 @@ define apt::ppa(
     fail('lsbdistcodename fact not available: release parameter required')
   }
 
+  if $::operatingsystem != 'Ubuntu' {
+    fail('apt::ppa is currently supported on Ubuntu only.')
+  }
+
   $filename_without_slashes = regsubst($name, '/', '-', 'G')
   $filename_without_dots    = regsubst($filename_without_slashes, '\.', '_', 'G')
   $filename_without_ppa     = regsubst($filename_without_dots, '^ppa:', '', 'G')
@@ -32,11 +36,13 @@ define apt::ppa(
     if defined(Class[apt]) {
         $proxy_host = $apt::proxy_host
         $proxy_port = $apt::proxy_port
-        case  $proxy_host {
-        false, '': {
+        case $proxy_host {
+          false, '', undef: {
             $proxy_env = []
-        }
-        default: {$proxy_env = ["http_proxy=http://${proxy_host}:${proxy_port}", "https_proxy=http://${proxy_host}:${proxy_port}"]}
+          }
+          default: {
+            $proxy_env = ["http_proxy=http://${proxy_host}:${proxy_port}", "https_proxy=http://${proxy_host}:${proxy_port}"]
+          }
         }
     } else {
         $proxy_env = []