1 fix warnings for "warning: shadowing outer local variable - line"
2 side effect is that code starts to work again.
4 --- cvsspam-0.2.12/collect_diffs.rb 2010-06-18 12:15:54.514725990 +0300
5 +++ cvsspam-0.2.12/collect_diffs.rb 2010-06-18 12:16:09.410605410 +0300
8 raise "missing data dir (#{$tmpdir}/#{$dirtemplate}-XXXXXX)" if $datadir==nil
11 - unless line =~ /^Update of (.+)/
12 + unless $stdin.gets =~ /^Update of (.+)/
13 fail "Log preamble looks suspect (doesn't start 'Update of ...')"
19 # look for the start of the user's comment
20 + got_log_message = false
22 - break if line =~ /^Log Message/
23 + if line =~ /^Log Message/
24 + got_log_message = true
29 - unless line =~ /^Log Message/
30 + unless got_log_message
31 fail "Input did not contain a 'Log Message:' entry"
35 blah("about to run #{diff_cmd.join(' ')}")
36 safer_popen(*diff_cmd) do |pipe|
37 # skip over cvs-diff's preamble
39 - break if line =~ /^diff /
43 + break if l =~ /^diff /
45 file.puts "#U #{line}"
47 - file.puts "#U #{line}"