LT 113: Fix bugs with mail and message generation

Index: ChangeLog from Nicolas Pouillard <ertai@lrde.epita.fr> * rcs-wrapper/src/message.rb: Fix a bug with mkchangelog call. * rcs-wrapper/src/mail.rb: Use StringIO for the final message. Index: rcs-wrapper/src/message.rb --- rcs-wrapper/src/message.rb (revision 114) +++ rcs-wrapper/src/message.rb (working copy) @@ -27,13 +27,13 @@ def message ( *args ) unless @@message.exist? - cl = mkchangelog + cl = mkchangelog(*args) @@message.open('w') do |f| f.puts 'Index: ChangeLog' cl.each { |line| f.print line.sub(/^\d+-\d+-\d+/, 'from') } f.puts # FIXME: need to remove the ChangeLog entry in diff. - diff.each { |line| f.print line unless line =~ /^=+$/ } + diff(*args).each { |line| f.print line unless line =~ /^=+$/ } end end @@message.open('r') Index: rcs-wrapper/src/mail.rb --- rcs-wrapper/src/mail.rb (revision 114) +++ rcs-wrapper/src/mail.rb (working copy) @@ -16,7 +16,7 @@ require 'optparse' result = { - :from => EMAIL, #FULL_EMAIL, + :from => FULL_EMAIL, :to => [], :server => ENV['SMTPSERVER'] || 'localhost', } @@ -71,7 +71,7 @@ end end @@mail.delete - ['Mail: Sent.'] + StringIO.new('Mail: Sent.') end end # class Rcs
participants (1)
-
Nicolas Pouillard