Work around PUP-4133

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 808c9751a042b32196dfc8c918216699f5085748..f3e2bfda040c82f3890fce47947949590c04c338 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -31,9 +31,9 @@ define apt::ppa(
     $_proxy = $::apt::_proxy
     if $_proxy['host'] {
       if $_proxy['https'] {
-        $_proxy_env = ["http_proxy=http://${_proxy['host']}:${_proxy['port']}", "https_proxy=https://${_proxy['host']}:${_proxy['port']}"]
+        $_proxy_env = ["http_proxy=http://${$_proxy['host']}:${$_proxy['port']}", "https_proxy=https://${$_proxy['host']}:${$_proxy['port']}"]
       } else {
-        $_proxy_env = ["http_proxy=http://${_proxy['host']}:${_proxy['port']}"]
+        $_proxy_env = ["http_proxy=http://${$_proxy['host']}:${$_proxy['port']}"]
       }
     } else {
       $_proxy_env = []

diff --git a/manifests/source.pp b/manifests/source.pp
index 40fc015bb6e8a194038d50e1f7444cb0bfc965b8..958bf25c79fea2e9b250a2dd09554da911a8e645 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -65,7 +65,7 @@ define apt::source(
   # We do not want to remove keys when the source is absent.
   if $key and ($ensure == 'present') {
     if is_hash($_key) {
-      apt::key { "Add key: ${_key['id']} from Apt::Source ${title}":
+      apt::key { "Add key: ${$_key['id']} from Apt::Source ${title}":
         ensure  => present,
         id      => $_key['id'],
         server  => $_key['server'],