From 494abedaebb87be7208581e28142f68a3f3404a2 Mon Sep 17 00:00:00 2001 From: Daniele Sluijters Date: Fri, 24 Apr 2015 00:12:30 +0200 Subject: [PATCH] Work around PUP-4133 --- manifests/ppa.pp | 4 ++-- manifests/source.pp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/ppa.pp b/manifests/ppa.pp index 808c975..f3e2bfd 100644 --- 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 40fc015..958bf25 100644 --- 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'], -- 2.32.3