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 | 3914cdeba080516b59d471e3e46598ef251e42c3 (patch) | |
tree | fbd68bc3eec25ddfc2d91ab4e7bd0aeda7e3ac53 /lib/rdoc | |
parent | 20d5f17dc52f82b4d189693ef8a5ca937014511b (diff) | |
download | ruby-3914cdeba080516b59d471e3e46598ef251e42c3.tar.gz ruby-3914cdeba080516b59d471e3e46598ef251e42c3.tar.xz ruby-3914cdeba080516b59d471e3e46598ef251e42c3.zip |
* lib/rdoc/options.rb (Options::check_diagram): dot -V output
changed. [ ruby-Bugs-11978 ], Thanks Florian Frank.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13486 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc')
-rw-r--r-- | lib/rdoc/options.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb index 4dfe45169..bea7e6bdc 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, |