diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/commands/plugin.rb | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 5d6907498f..e67db7478a 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix script/plugin about so it uses about.yml and not meta.yml. [James Adam] + * Dispatcher processes rescued actions with the same controller that processed the request. #4625 [sd@notso.net] * rails -d frontbase to create a new project with a frontbase database.yml. #4945 [mlaster@metavillage.com] diff --git a/railties/lib/commands/plugin.rb b/railties/lib/commands/plugin.rb index 22f569acdc..2cdc19db41 100644 --- a/railties/lib/commands/plugin.rb +++ b/railties/lib/commands/plugin.rb @@ -197,15 +197,15 @@ class Plugin end def info - tmp = "#{rails_env.root}/_tmp_meta.yml" + tmp = "#{rails_env.root}/_tmp_about.yml" if svn_url? cmd = "svn export #{@uri} \"#{rails_env.root}/#{tmp}\"" puts cmd if $verbose system(cmd) end - open(svn_url? ? tmp : File.join(@uri, 'meta.yml')) do |stream| + open(svn_url? ? tmp : File.join(@uri, 'about.yml')) do |stream| stream.read - end rescue "No meta.yml found in #{uri}" + end rescue "No about.yml found in #{uri}" ensure FileUtils.rm_rf tmp if svn_url? end @@ -836,7 +836,7 @@ module Commands OptionParser.new do |o| o.set_summary_indent(' ') o.banner = "Usage: #{@base_command.script_name} info name [name]..." - o.define_head "Shows plugin info at {url}/meta.yml." + o.define_head "Shows plugin info at {url}/about.yml." end end |