From ff8f8c190b5efa391f1b08260847515fea76cd90 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 10 Dec 2011 12:17:30 +0000 Subject: merge revision(s) 20587: * mkconfig.rb: fix for continued lines. based on a patch from Marcus Rueckert at [ruby-core:20420]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@34002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ mkconfig.rb | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12e303728f..6877e57c7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 17 04:20:22 2011 Nobuyoshi Nakada + + * mkconfig.rb: fix for continued lines. based on a patch from + Marcus Rueckert at [ruby-core:20420]. + Mon Oct 17 04:19:39 2011 Yukihiro Matsumoto * numeric.c (flo_cmp): Infinity is greater than any bignum diff --git a/mkconfig.rb b/mkconfig.rb index f662c825e3..bab3012c65 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" -- cgit v1.2.3