Skip to content

Commit ec5b802

Browse files
committed
Remove logic for older versions of Rake
1 parent 5e4b124 commit ec5b802

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

Rakefile

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,10 @@
44
$LOAD_PATH.unshift(File.expand_path("lib"))
55
require 'puppet/version'
66

7-
begin
8-
require 'rubygems'
9-
require 'rubygems/package_task'
10-
rescue LoadError
11-
# Users of older versions of Rake (0.8.7 for example) will not necessarily
12-
# have rubygems installed, or the newer rubygems package_task for that
13-
# matter.
14-
require 'rake/packagetask'
15-
require 'rake/gempackagetask'
16-
end
17-
18-
require 'rake'
197
require 'open3'
8+
require 'rake'
9+
require 'rubygems'
10+
require 'rubygems/package_task'
2011

2112
if Rake.application.top_level_tasks.grep(/^(pl:|package:)/).any?
2213
begin

0 commit comments

Comments
 (0)