From 28af965bd1a4b0d21965435bd94ed9355341b4a9 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 28 May 2016 12:12:11 +0100 Subject: [PATCH] Don't use the brightbox ruby repo on Ubuntu 16.04 --- cookbooks/apt/recipes/default.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb index 4874d15fb..e3787470a 100644 --- a/cookbooks/apt/recipes/default.rb +++ b/cookbooks/apt/recipes/default.rb @@ -37,9 +37,15 @@ template "/etc/apt/sources.list" do notifies :run, "execute[apt-update]", :immediately end -apt_source "brightbox-ruby-ng" do - url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu" - key "C3173AA6" +if node[:lsb][:release].to_f >= 16.04 + apt_source "brightbox-ruby-ng" do + action :delete + end +else + apt_source "brightbox-ruby-ng" do + url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu" + key "C3173AA6" + end end apt_source "ubuntugis-stable" do -- 2.43.2