Remove an Ubuntu 12.10 compatibility hack

[chef.git] / cookbooks / apt / recipes / default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index b1e5825ebf5e0cc26bfb7099092f5bbcc84c379b..189c0be4dedee2b98fc91c71fd895f98d5be8fc3 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -29,13 +29,8 @@ execute "apt-update" do
   command "/usr/bin/apt-get update"
 end
 
-sources_template = case node[:lsb][:release].to_f
-  when 12.10 then "old-sources.list.erb"
-  else "sources.list.erb"
-end
-
 template "/etc/apt/sources.list" do
-  source sources_template
+  source "sources.list.erb"
   owner "root"
   group "root"
   mode 0644
@@ -57,12 +52,10 @@ apt_source "ubuntugis-unstable" do
   key "314DF160"
 end
 
-if node[:lsb][:release].to_f == 12.04 || node[:lsb][:release].to_f == 12.10
-  apt_source "openstreetmap" do
-    template "openstreetmap.list.erb"
-    url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
-    key "0AC4F2CB"
-  end
+apt_source "openstreetmap" do
+  template "openstreetmap.list.erb"
+  url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
+  key "0AC4F2CB"
 end
 
 apt_source "management-component-pack" do