Changeset 109
- Timestamp:
- 09/29/06 09:27:12 (18 years ago)
- Location:
- emailtotracscript/trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
emailtotracscript/trunk/Makefile.in
r95 r109 16 16 TRAC_USER=@trac_user@ 17 17 MTA_USER=@mta_user@ 18 DEBUG=@DEBUG@ 18 19 19 20 TRAC_SCRIPT_NAME=email2trac … … 21 22 CC=@CC@ 22 23 INSTALL=./install-sh 23 DEBUG=024 24 CFLAGS=-DMTA_USER=\"$(MTA_USER)\" -DTRAC_USER=\"$(TRAC_USER)\" -DTRAC_SCRIPT_NAME=\"$(TRAC_SCRIPT_NAME)\" -DTRAC_SCRIPT_PATH=\"$(EXEC_PREFIX)\" -DDEBUG=$(DEBUG) 25 25 -
emailtotracscript/trunk/configure
r24 r109 273 273 274 274 ac_unique_file="email2trac.py.in" 275 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS pyexecdir trac_user mta_user email2trac_conf PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pkgpyexecdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREPSYSTEM_EMAIL2TRAC_CONF LIBOBJS LTLIBOBJS'275 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS pyexecdir trac_user mta_user PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pkgpyexecdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP DEBUG email2trac_conf SYSTEM_EMAIL2TRAC_CONF LIBOBJS LTLIBOBJS' 276 276 ac_subst_files='' 277 277 … … 1265 1265 1266 1266 1267 1267 #DEBUG=0 1268 1268 1269 1269 … … 2613 2613 2614 2614 2615 if test "x$DEBUG" = "x";then 2616 DEBUG=0 2617 fi 2618 2619 2615 2620 # Now a user can specify the TRAC user 2616 2621 # … … 2652 2657 #define SYSTEM_EMAIL2TRAC_CONF "$email2trac_conf" 2653 2658 _ACEOF 2659 2654 2660 2655 2661 … … 3297 3303 s,@trac_user@,$trac_user,;t t 3298 3304 s,@mta_user@,$mta_user,;t t 3299 s,@email2trac_conf@,$email2trac_conf,;t t3300 3305 s,@PYTHON@,$PYTHON,;t t 3301 3306 s,@PYTHON_VERSION@,$PYTHON_VERSION,;t t … … 3315 3320 s,@CPP@,$CPP,;t t 3316 3321 s,@EGREP@,$EGREP,;t t 3322 s,@DEBUG@,$DEBUG,;t t 3323 s,@email2trac_conf@,$email2trac_conf,;t t 3317 3324 s,@SYSTEM_EMAIL2TRAC_CONF@,$SYSTEM_EMAIL2TRAC_CONF,;t t 3318 3325 s,@LIBOBJS@,$LIBOBJS,;t t -
emailtotracscript/trunk/configure.in
r24 r109 14 14 AC_SUBST(sysconfdir) 15 15 16 #DEBUG=0 17 16 18 AM_PATH_PYTHON 17 19 AC_PROG_GCC_TRADITIONAL 20 21 if test "x$DEBUG" = "x";then 22 DEBUG=0 23 fi 24 AC_SUBST(DEBUG) 18 25 19 26 # Now a user can specify the TRAC user -
emailtotracscript/trunk/email2trac.py.in
r108 r109 353 353 354 354 body_text = self.get_body_text(m) 355 body_text = '{{{\n%s\n}}}' %body_text356 355 357 356 # Strip '#' and ':' from ticket_id … … 425 424 body_text = self.get_body_text(msg) 426 425 427 tkt['description'] = 'email2trac:%s\r\n {{{\r\n%s\r\n}}}' \426 tkt['description'] = 'email2trac:%s\r\n%s' \ 428 427 %(head, body_text) 429 428 … … 444 443 comment = '\nadded mailto line\n' 445 444 mailto = self.html_mailto_link(self.to_unicode(msg['subject']), ticket_id, body_text) 446 tkt['description'] = 'email2trac:%s%s\r\n{{{\r\n%s\r\n}}}' %(head, mailto, body_text) 445 #tkt['description'] = 'email2trac:%s%s\r\n{{{\r\n%s\r\n}}}' %(head, mailto, body_text) 446 tkt['description'] = 'email2trac:%s%s\r\n%s' %(head, mailto, body_text) 447 447 448 448 n = self.attachments(msg, tkt) … … 497 497 has_description = 0 498 498 encoding = True 499 ubody_text = u' \r\n{{{\nNo plain text message\n}}}\r\n'499 ubody_text = u'No plain text message' 500 500 for part in msg.walk(): 501 501 … … 529 529 530 530 elif part.get_content_type() == 'text/html': 531 ubody_text = ' \r\n(see attachment for HTML mail message)\r\n'531 ubody_text = '(see attachment for HTML mail message)' 532 532 533 533 else: 534 ubody_text = ' \r\n(see attachment for message)\r\n'534 ubody_text = '(see attachment for message)' 535 535 536 536 has_description = 1 … … 538 538 539 539 if not has_description: 540 ubody_text = ' \r\n(see attachment for message)\r\n'540 ubody_text = '(see attachment for message)' 541 541 542 542 # A patch so that the web-interface will not update the description … … 551 551 ubody_text = ubody_text.encode('utf-8') 552 552 553 ubody_text = '{{{\r\n%s\r\n}}}' %ubody_text 553 554 return ubody_text 554 555
Note: See TracChangeset
for help on using the changeset viewer.