diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-22 20:58:40 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-22 20:58:40 +0000 |
| commit | c5e449d8660aeaba76c50eca95c8037b2d3ae7e7 (patch) | |
| tree | fbd68bc3eec25ddfc2d91ab4e7bd0aeda7e3ac53 | |
| parent | 9b268cdbca9147515fca783448e66bb1aaa96677 (diff) | |
* lib/rdoc/options.rb (Options::check_diagram): dot -V output
changed. [ ruby-Bugs-11978 ], Thanks Florian Frank.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13486 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rdoc/options.rb | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Sep 23 05:42:35 2007 URABE Shyouhei <shyouhei@ruby-lang.org> + + * lib/rdoc/options.rb (Options::check_diagram): dot -V output + changed. [ ruby-Bugs-11978 ], Thanks Florian Frank. + Sat Sep 22 06:02:11 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/optparse.rb (OptionParser::List::summarize): use each_line if diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb index 4dfe45169c..bea7e6bdcd 100644 --- a/lib/rdoc/options.rb +++ b/lib/rdoc/options.rb @@ -550,12 +550,12 @@ class Options ver = nil IO.popen("dot -V 2>&1") do |io| ver = io.read - if ver =~ /dot\s+version(?:\s+gviz)?\s+(\d+)\.(\d+)/ + if ver =~ /dot.+version(?:\s+gviz)?\s+(\d+)\.(\d+)/ ok = ($1.to_i > 1) || ($1.to_i == 1 && $2.to_i >= 8) end end unless ok - if ver =~ /^dot version/ + if ver =~ /^dot.+version/ $stderr.puts "Warning: You may need dot V1.8.6 or later to use\n", "the --diagram option correctly. You have:\n\n ", ver, |