From: Tom Hughes <tom@compton.nu>
Date: Sun, 17 May 2020 18:25:41 +0000 (+0000)
Subject: Don't install python 2 on Ubuntu 20.04
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/8fe06bbc8474aaf0850bed1c03074f39b913b9df?hp=e9a4b9db43573b30d972dc6afbc1cc2751ed83ed

Don't install python 2 on Ubuntu 20.04
---

diff --git a/cookbooks/python/recipes/default.rb b/cookbooks/python/recipes/default.rb
index 53dc4c59a..00f763bac 100644
--- a/cookbooks/python/recipes/default.rb
+++ b/cookbooks/python/recipes/default.rb
@@ -17,10 +17,12 @@
 # limitations under the License.
 #
 
-package "python"
-package "python-pip"
+if node[:lsb][:release].to_f < 20.04
+  package "python"
+  package "python-pip"
+end
 
 package "python3"
 package "python3-pip"
 
-package "python-virtualenv"
+package "virtualenv"