diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-12 14:54:37 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-12 14:54:37 +0000 |
| commit | f86a88610fc6a3d1a70be161ee5d5d6bf9f542e9 (patch) | |
| tree | 3c00115682146f9682887089b299f07528e56333 | |
| parent | 91f99410263aa5808c17ac1f38a69ec59f759f95 (diff) | |
merges r20587 from trunk into ruby_1_9_1.
* mkconfig.rb: fix for continued lines. based on a patch from
Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420].
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | mkconfig.rb | 11 |
2 files changed, 10 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Tue Dec 9 03:21:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * mkconfig.rb: fix for continued lines. based on a patch from + Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420]. + Fri Dec 5 22:56:24 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * eval.c (rb_make_exception): single argument to raise may be diff --git a/mkconfig.rb b/mkconfig.rb index e56af5d04..d6a9d0398 100755 --- a/mkconfig.rb +++ b/mkconfig.rb @@ -56,14 +56,13 @@ File.foreach "config.status" do |line| continued_name = name next end - when /^"(.+)"\s*(\\)?$/ + when /^"(.*)"\s*(\\)?$/ if continued_line continued_line << $1 - unless $2 - val = continued_line.join("") - name = continued_name - continued_line = nil - end + next if $2 + val = continued_line.join("") + name = continued_name + continued_line = nil end when /^(?:ac_given_)?INSTALL=(.*)/ v_fast << " CONFIG[\"INSTALL\"] = " + $1 + "\n" |