Changeset 666
- Timestamp:
- 04/28/15 10:40:03 (9 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r664 r666 1 2.8.9: 2 * Added a new parameter only save email and removed some obsolete code in ave_email_for_debug, 3 - save_raw_message 4 Author: Bas van der Vlies 5 1 6 2.8.8: 2 7 * No properly applied the patch for ticket #364. -
trunk/email2trac.py.in
r664 r666 562 562 pass 563 563 564 def save_email_for_debug(self, message, project_name, create_tempfile=False):564 def save_email_for_debug(self, message, project_name, save_only_raw_message=False): 565 565 566 566 if self.parameters.dry_run: … … 568 568 return 569 569 570 if create_tempfile: 571 (fd, tmp_file) = tempfile.mkstemp('.%s.email2trac' %project_name) 572 fx = os.fdopen(fd, 'wb') 573 else: 574 tmp_file = os.path.join(self.parameters.tmpdir, 'msg.%s.email2trac' %project_name) 575 fx = open(tmp_file, 'wb') 576 570 (fd, tmp_file) = tempfile.mkstemp('.email2trac', project_name, self.parameters.tmpdir) 571 fx = os.fdopen(fd, 'wb') 577 572 578 573 self.logger.debug('saving email to %s' %(tmp_file)) … … 585 580 pass 586 581 587 message_parts = self.get_message_parts(message) 588 message_parts = self.unique_attachment_names(message_parts) 589 body_text = self.get_body_text(message_parts) 590 self.debug_body(body_text, tmp_file) 591 self.debug_attachments(message_parts, tmp_file) 582 if not save_only_raw_message: 583 message_parts = self.get_message_parts(message) 584 message_parts = self.unique_attachment_names(message_parts) 585 body_text = self.get_body_text(message_parts) 586 self.debug_body(body_text, tmp_file) 587 self.debug_attachments(message_parts, tmp_file) 592 588 593 589 ########## Conversion functions ########################################################### … … 1772 1768 pass 1773 1769 1774 if self.parameters.debug: # save the entire e-mail message text 1770 if self.parameters.debug: # save email + try to decode message part 1771 self.save_email_for_debug(m, self.parameters.project_name) 1772 elif self.parameters.save_raw_message: # save only the raw e-mail message text 1775 1773 self.save_email_for_debug(m, self.parameters.project_name, True) 1776 1774 … … 2924 2922 2925 2923 if m: 2926 tktparser.save_email_for_debug(m, settings.project_name , True)2924 tktparser.save_email_for_debug(m, settings.project_name) 2927 2925 2928 2926 sys.exit(1)
Note: See TracChangeset
for help on using the changeset viewer.