summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlamont-granquist <lamont@scriptkiddie.org>2013-06-12 14:58:45 -0700
committerlamont-granquist <lamont@scriptkiddie.org>2013-06-12 14:58:45 -0700
commitdffa2a661ec1f63de1acf3f6d97b99960ec65ada (patch)
treebd634a646d42a2810c6959a9a8d8391e65a71ed3
parent6ce2cbf4456dffd575a44e269d00df4a751cbfa8 (diff)
parenta550cd91c8fb28a9f98ec9fec5336291cfe7029f (diff)
downloadchef-dffa2a661ec1f63de1acf3f6d97b99960ec65ada.tar.gz
Merge pull request #818 from opscode/lcg/ruby-2.0.0-rake-install
fixes for 'rake install' on ruby-2.0.0
-rw-r--r--Rakefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Rakefile b/Rakefile
index b227bd3e7a..c223a60618 100644
--- a/Rakefile
+++ b/Rakefile
@@ -48,10 +48,12 @@ begin
end
rescue LoadError
puts "sdoc is not available. (sudo) gem install sdoc to generate rdoc documentation."
+rescue TypeError
+ puts "sdoc is not working on ruby-2.0.0 and throwing an odd TypeError, rdoc generation will be disabled on ruby 2.0 until that gets fixed."
end
task :install => :package do
- sh %{gem install pkg/#{GEM_NAME}-#{Chef::VERSION} --no-rdoc --no-ri}
+ sh %{gem install pkg/#{GEM_NAME}-#{Chef::VERSION}.gem --no-rdoc --no-ri}
end
task :uninstall do