From 2ac7f97471a2f927ba54197f962575971314c722 Mon Sep 17 00:00:00 2001 From: Stefan Sundin Date: Wed, 22 May 2019 09:30:42 -0700 Subject: [PATCH 1/3] Remove erlang-ftp and erlang-tftp as they are not available for Ubuntu 16.04 (xenial) in the rabbitmq-erlang repository. --- providers/erlang_package_from_bintray.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/erlang_package_from_bintray.rb b/providers/erlang_package_from_bintray.rb index 3bf6313e..6d4abe6d 100644 --- a/providers/erlang_package_from_bintray.rb +++ b/providers/erlang_package_from_bintray.rb @@ -24,7 +24,7 @@ DEBIAN_PACKAGES = %w(erlang-mnesia erlang-runtime-tools erlang-asn1 erlang-crypto erlang-public-key erlang-ssl erlang-syntax-tools erlang-snmp erlang-os-mon erlang-parsetools - erlang-ftp erlang-tftp erlang-inets erlang-tools erlang-eldap erlang-xmerl + erlang-inets erlang-tools erlang-eldap erlang-xmerl erlang-dev erlang-edoc erlang-eunit erlang-erl-docgen erlang-src).freeze action :install do From f2669c9a7add8769acc32524418bcc8ba1c1bc5a Mon Sep 17 00:00:00 2001 From: Stefan Sundin Date: Wed, 22 May 2019 12:11:42 -0700 Subject: [PATCH 2/3] Remove erlang-ftp and erlang-tftp programatically based on lsb_codename, since they are not available for xenial. --- providers/erlang_package_from_bintray.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/providers/erlang_package_from_bintray.rb b/providers/erlang_package_from_bintray.rb index 6d4abe6d..8541d654 100644 --- a/providers/erlang_package_from_bintray.rb +++ b/providers/erlang_package_from_bintray.rb @@ -24,7 +24,7 @@ DEBIAN_PACKAGES = %w(erlang-mnesia erlang-runtime-tools erlang-asn1 erlang-crypto erlang-public-key erlang-ssl erlang-syntax-tools erlang-snmp erlang-os-mon erlang-parsetools - erlang-inets erlang-tools erlang-eldap erlang-xmerl + erlang-ftp erlang-tftp erlang-inets erlang-tools erlang-eldap erlang-xmerl erlang-dev erlang-edoc erlang-eunit erlang-erl-docgen erlang-src).freeze action :install do @@ -37,6 +37,10 @@ erlang_packages = [base_pkg] + DEBIAN_PACKAGES + if node['rabbitmq']['erlang']['apt']['lsb_codename'] == 'xenial' + erlang_packages -= %w(erlang-ftp erlang-tftp) + end + unless new_resource.version.nil? erlang_packages.each do |p| apt_preference "#{new_resource.name}-#{p}" do From f4502527d8611b4ea6bd7338102a8dd56131370c Mon Sep 17 00:00:00 2001 From: Stefan Sundin Date: Wed, 22 May 2019 14:33:57 -0700 Subject: [PATCH 3/3] Add a comment. --- providers/erlang_package_from_bintray.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/providers/erlang_package_from_bintray.rb b/providers/erlang_package_from_bintray.rb index 8541d654..f899cc89 100644 --- a/providers/erlang_package_from_bintray.rb +++ b/providers/erlang_package_from_bintray.rb @@ -37,6 +37,7 @@ erlang_packages = [base_pkg] + DEBIAN_PACKAGES + # xenial does not have these packages if node['rabbitmq']['erlang']['apt']['lsb_codename'] == 'xenial' erlang_packages -= %w(erlang-ftp erlang-tftp) end