Changeset 109 for emailtotracscript

Timestamp:

09/29/06 09:27:12 (18 years ago)

Author:

bas

Message:

EmailtoTracScript?:

email2trac.py.in:

• Changed some layout statements

configure, Makefile.in, configure.in:

• Can set DEBUG value on command line; eg: DEBUG=1 ./configure default is: 0

Location:

emailtotracscript/trunk

Files:

• Makefile.in (modified) (2 diffs)
• configure (modified) (6 diffs)
• configure.in (modified) (1 diff)
• email2trac.py.in (modified) (7 diffs)

emailtotracscript/trunk/Makefile.in

@@ -16 +16 @@
 TRAC_USER=@trac_user@
 MTA_USER=@mta_user@
+DEBUG=@DEBUG@
 
 TRAC_SCRIPT_NAME=email2trac
@@ -21 +22 @@
 CC=@CC@
 INSTALL=./install-sh
-DEBUG=0
 CFLAGS=-DMTA_USER=\"$(MTA_USER)\" -DTRAC_USER=\"$(TRAC_USER)\" -DTRAC_SCRIPT_NAME=\"$(TRAC_SCRIPT_NAME)\" -DTRAC_SCRIPT_PATH=\"$(EXEC_PREFIX)\" -DDEBUG=$(DEBUG)
 

emailtotracscript/trunk/configure

@@ -273 +273 @@
 
 ac_unique_file="email2trac.py.in"
-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 EGREP SYSTEM_EMAIL2TRAC_CONF LIBOBJS LTLIBOBJS'
+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'
 ac_subst_files=''
 
@@ -1265 +1265 @@
 
 
-
+#DEBUG=0
 
 
@@ -2613 +2613 @@
 
 
+if test "x$DEBUG" = "x";then
+  DEBUG=0
+fi
+
+
 # Now a user can specify the TRAC user
 #
@@ -2652 +2657 @@
 #define SYSTEM_EMAIL2TRAC_CONF "$email2trac_conf"
 _ACEOF
+
 
 
@@ -3297 +3303 @@
 s,@trac_user@,$trac_user,;t t
 s,@mta_user@,$mta_user,;t t
-s,@email2trac_conf@,$email2trac_conf,;t t
 s,@PYTHON@,$PYTHON,;t t
 s,@PYTHON_VERSION@,$PYTHON_VERSION,;t t
@@ -3315 +3320 @@
 s,@CPP@,$CPP,;t t
 s,@EGREP@,$EGREP,;t t
+s,@DEBUG@,$DEBUG,;t t
+s,@email2trac_conf@,$email2trac_conf,;t t
 s,@SYSTEM_EMAIL2TRAC_CONF@,$SYSTEM_EMAIL2TRAC_CONF,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t

emailtotracscript/trunk/configure.in

@@ -14 +14 @@
 AC_SUBST(sysconfdir)
 
+#DEBUG=0
+
 AM_PATH_PYTHON
 AC_PROG_GCC_TRADITIONAL
+
+if test "x$DEBUG" = "x";then
+  DEBUG=0
+fi
+AC_SUBST(DEBUG)
 
 # Now a user can specify the TRAC user

emailtotracscript/trunk/email2trac.py.in

@@ -353 +353 @@
 
                 body_text = self.get_body_text(m)
-                body_text = '{{{\n%s\n}}}' %body_text
 
                 # Strip '#' and ':' from ticket_id
@@ -425 +424 @@
                 body_text = self.get_body_text(msg)
 
-                tkt['description'] = 'email2trac:%s\r\n{{{\r\n%s\r\n}}}' \
+                tkt['description'] = 'email2trac:%s\r\n%s' \
                         %(head, body_text)
 
@@ -444 +443 @@
                         comment = '\nadded mailto line\n'
                         mailto = self.html_mailto_link(self.to_unicode(msg['subject']), ticket_id, body_text)
-                        tkt['description'] = 'email2trac:%s%s\r\n{{{\r\n%s\r\n}}}' %(head, mailto, body_text)
+                        #tkt['description'] = 'email2trac:%s%s\r\n{{{\r\n%s\r\n}}}' %(head, mailto, body_text)
+                        tkt['description'] = 'email2trac:%s%s\r\n%s' %(head, mailto, body_text)
 
                 n =  self.attachments(msg, tkt)
@@ -497 +497 @@
                 has_description = 0
                 encoding = True
-                ubody_text = u'\r\n{{{\nNo plain text message\n}}}\r\n'
+                ubody_text = u'No plain text message'
                 for part in msg.walk():
 
@@ -529 +529 @@
 
                         elif part.get_content_type() == 'text/html':
-                                ubody_text = '\r\n(see attachment for HTML mail message)\r\n'
+                                ubody_text = '(see attachment for HTML mail message)'
 
                         else:
-                                ubody_text = '\r\n(see attachment for message)\r\n'
+                                ubody_text = '(see attachment for message)'
 
                         has_description = 1
@@ -538 +538 @@
 
                 if not has_description:
-                        ubody_text = '\r\n(see attachment for message)\r\n'
+                        ubody_text = '(see attachment for message)'
 
                 # A patch so that the web-interface will not update the description
@@ -551 +551 @@
                         ubody_text = ubody_text.encode('utf-8')
 
+                ubody_text = '{{{\r\n%s\r\n}}}' %ubody_text
                 return ubody_text