Permalink
Browse files

r3157@asus: jeremy | 2005-11-17 21:27:39 -0800

 Apply [3081] to stable.  Eliminate nil from newly generated logfiles.  Closes #2927.


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@3088 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent dcaa871 commit beddd9680e97cbb4b8c301632f220ecaf1b78500 @jeremy jeremy committed Nov 18, 2005
Showing with 3 additions and 1 deletion.
  1. +2 −0 railties/CHANGELOG
  2. +1 −1 railties/lib/rails_generator/commands.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Eliminate nil from newly generated logfiles. #2927 [Blair Zajac <blair@orcaware.com>]
+
* Update to Prototype 1.4.0_rc3. Closes #1893, #2505, #2550, #2748, #2783. [Sam Stephenson]
* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
@@ -192,7 +192,7 @@ def file(relative_source, relative_destination, file_options = {}, &block)
if block_given?
df.write(yield(sf))
else
- line = sf.gets
+ line = sf.gets || ''
if file_options[:shebang]
df.puts("#!#{file_options[:shebang]}")
df.puts(line) if line !~ /^#!/

0 comments on commit beddd96

Please sign in to comment.