Changeset 528 for trunk/email2trac.py.in
- Timestamp:
- 06/23/11 13:35:31 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/email2trac.py.in
r527 r528 415 415 def debug_body(self, message_body, temporary_file=False): 416 416 if temporary_file: 417 (fd, body_file) = tempfile.mkstemp('. email2trac')417 (fd, body_file) = tempfile.mkstemp('.body_email2trac') 418 418 fx = os.fdopen(fd, 'wb') 419 419 else: … … 462 462 filename = filename.replace('\\', '_') 463 463 filename = filename.replace('/', '_') 464 filename = filename + '.att_email2trac' 464 465 465 466 466 part_file = os.path.join(self.parameters.tmpdir, filename) 467 467 s = 'writing part%d (%s)' % (n,part_file) … … 488 488 pass 489 489 490 def save_email_for_debug(self, message, create_tempfile=False): 490 def save_email_for_debug(self, message, project_name, create_tempfile=False): 491 492 if self.parameters.dry_run: 493 print 'DRY_RUN: NOT saving email message' 494 return 491 495 492 496 if create_tempfile: 493 (fd, msg_file) = tempfile.mkstemp('. email2trac')497 (fd, msg_file) = tempfile.mkstemp('.%s.email2trac' %project_name) 494 498 fx = os.fdopen(fd, 'wb') 495 499 else: 496 500 #msg_file = '/var/tmp/msg.txt' 497 msg_file = os.path.join(self.parameters.tmpdir, 'msg. txt')501 msg_file = os.path.join(self.parameters.tmpdir, 'msg.%s.email2trac' %project_name) 498 502 fx = open(msg_file, 'wb') 499 503 500 if self.parameters.dry_run: 501 print 'DRY_RUN: NOT saving email message to %s' %(msg_file) 502 else: 503 print 'saving email to %s' %(msg_file) 504 505 fx.write('%s' % message) 506 fx.close() 507 508 try: 509 os.chmod(msg_file,S_IRWXU|S_IRWXG|S_IRWXO) 510 except OSError: 511 pass 504 505 print 'saving email to %s' %(msg_file) 506 fx.write('%s' % message) 507 fx.close() 508 509 try: 510 os.chmod(msg_file,S_IRWXU|S_IRWXG|S_IRWXO) 511 except OSError: 512 pass 512 513 513 514 message_parts = self.get_message_parts(message) … … 1547 1548 1548 1549 if self.parameters.debug: # save the entire e-mail message text 1549 self.save_email_for_debug(m, True)1550 self.save_email_for_debug(m, self.parameters.project_name, True) 1550 1551 1551 1552 self.db = self.env.get_db_cnx() … … 2256 2257 else: 2257 2258 project['project'] = os.path.join(parentdir, name) 2259 2260 ## 2261 # Save the project name 2262 # 2263 project['project_name'] = os.path.basename(project['project']) 2258 2264 2259 2265 return project … … 2490 2496 2491 2497 if m: 2492 tktparser.save_email_for_debug(m, True)2498 tktparser.save_email_for_debug(m, settings.project_name, True) 2493 2499 2494 2500 sys.exit(1)
Note: See TracChangeset
for help on using the changeset viewer.