Skip to content
Browse files

Apply freeze gems fix to stable

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@3192 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent b762e01 commit 786726692f01733d44d0a3c7f9d32d876557bff5 @seckar seckar committed Nov 28, 2005
Showing with 5 additions and 2 deletions.
  1. +2 −0 railties/CHANGELOG
  2. +3 −2 railties/lib/tasks/framework.rake
View
2 railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix freeze_gems so that the latest rails version is dumped by default. [Nicholas Seckar]
+
* Model generator: correct relative path to test_helper in unit test. [Jeremy Kemper]
* Make the db_schema_dump task honor the SCHEMA environment variable if present the way db_schema_import does. #2931. [Blair Zajac]
View
5 railties/lib/tasks/framework.rake
@@ -8,6 +8,7 @@ task :freeze_gems do
else
Gem.cache.search('rails').sort_by { |g| g.version }.last
end
+ version ||= rails.version
unless rails
puts "No rails gem #{version} is installed. Do 'gem list rails' to see what you have available."
@@ -21,8 +22,8 @@ task :freeze_gems do
rails.dependencies.select { |g| deps.include? g.name }.each do |g|
system "cd vendor/rails; gem unpack -v '#{g.version_requirements}' #{g.name}; mv #{g.name}* #{g.name}"
end
- system "cd vendor/rails; gem unpack -v '= #{version}' rails"
-
+ system "cd vendor/rails; gem unpack -v '=#{version}' rails"
+
FileUtils.mv(Dir.glob("vendor/rails/rails*").first, "vendor/rails/railties")
end

0 comments on commit 7867266

Please sign in to comment.
Something went wrong with that request. Please try again.