CVS: tmda/TMDA ChangeLog,1.304,1.305 Defaults.py,1.191,1.192

Update of /cvsroot/tmda/tmda/TMDA
In directory sc8-pr-cvs1:/tmp/cvs-serv14960/TMDA

Modified Files:
	ChangeLog Defaults.py 
Log Message:
Look for $TMDAINJECT in the environment first before TMDAINJECT in
config.  It's a long story why I need this.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/ChangeLog,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- ChangeLog	9 Jan 2004 19:36:26 -0000	1.304
+++ ChangeLog	10 Jan 2004 18:59:52 -0000	1.305
@@ -1,3 +1,8 @@
+2004-01-10  Jason R. Mastaler  <[email protected]>
+
+	* Defaults.py (TMDAINJECT): Look for $TMDAINJECT in the
+	environment first.
+	
 2004-01-09  Jason R. Mastaler  <[email protected]>
 
 	* Defaults.py (DATED_TIMEOUT): TIMEOUT renamed.

Index: Defaults.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Defaults.py,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- Defaults.py	10 Jan 2004 18:15:12 -0000	1.191
+++ Defaults.py	10 Jan 2004 18:59:52 -0000	1.192
@@ -1462,13 +1462,18 @@
 #       existing Message-ID fields.  Normally tmda-inject only adds a
 #       Message-ID field if the incoming message lacks one.
 #
+# TMDAINJECT is looked for in the environment first.
+#
 # Examples:
 #
 # TMDAINJECT = "i"
 # TMDAINJECT = "di"
 #
 # No default.
-if not vars().has_key('TMDAINJECT'):
+env_TMDAINJECT = os.environ.get('TMDAINJECT')
+if env_TMDAINJECT:
+    TMDAINJECT = env_TMDAINJECT
+elif not vars().has_key('TMDAINJECT'):
     TMDAINJECT = ''
 
 # SUMMARY_HEADERS