Merge branch 'CHEF-1379'

RichardN · Jul 8, 2010 · 43bd54a · 43bd54a
2 parents 82f9d18 + e181fe8
commit 43bd54a
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/chef/lib/chef/provider/service/upstart.rb b/chef/lib/chef/provider/service/upstart.rb
@@ -44,16 +44,9 @@ def initialize(new_resource, run_context)
           run_context.node
 
           platform, version = Chef::Platform.find_platform_and_version(run_context.node)
-          case platform
-          when "ubuntu"
-            case version
-            when /8.04/,/8.10/,/9.04/,/10.04/
-              @upstart_job_dir = "/etc/event.d"
-              @upstart_conf_suffix = ""
-            else
-              @upstart_job_dir = "/etc/init"
-              @upstart_conf_suffix = ".conf"
-            end
+          if platform == "ubuntu" && (8.04..9.04).include?(version.to_f)
+            @upstart_job_dir = "/etc/event.d"
+            @upstart_conf_suffix = ""
           else
             @upstart_job_dir = "/etc/init"
             @upstart_conf_suffix = ".conf"