INN commit: branches/2.5/scripts (innshellvars.tcl.in)

INN Commit rra at isc.org
Wed Aug 11 15:20:09 UTC 2010


    Date: Wednesday, August 11, 2010 @ 08:20:09
  Author: iulius
Revision: 9103

Fix the Tcl innshellvars script (which has not worked since INN 2.3).

A variable was unset, and the evaluation of innconfval was not working.

Also add a catch block in case the Tcl interpreter does not recognize
the umask command.

Modified:
  branches/2.5/scripts/innshellvars.tcl.in

---------------------+
 innshellvars.tcl.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: innshellvars.tcl.in
===================================================================
--- innshellvars.tcl.in	2010-08-11 15:19:24 UTC (rev 9102)
+++ innshellvars.tcl.in	2010-08-11 15:20:09 UTC (rev 9103)
@@ -12,7 +12,7 @@
 
 set prefix "@prefix@"
 set exec_prefix "@exec_prefix@"
-eval `@bindir@/innconfval -t`
+eval [exec @bindir@/innconfval -t]
 
 set inn_newshome "$inn_pathnews"
 set inn_spooldir "$inn_pathspool"
@@ -65,8 +65,8 @@
 set inn_perl_startup_innd "${inn_pathfilter}/startup_innd.pl"
 set inn_perl_filter_innd "${inn_pathfilter}/filter_innd.pl"
 set inn_perl_filter_nnrpd "${inn_pathfilter}/filter_nnrpd.pl"
-set inn_python_filter_innd "${pathfilter}/filter_innd.py"
-set inn_path_python_inn_module "${pathfilter}/INN.py"
+set inn_python_filter_innd "${inn_pathfilter}/filter_innd.py"
+set inn_path_python_inn_module "${inn_pathfilter}/INN.py"
 set inn_path_tcl_startup "${inn_pathfilter}/startup.tcl"
 set inn_path_tcl_filter "${inn_pathfilter}/filter.tcl"
 
@@ -124,7 +124,7 @@
 set env(NEWSLBIN) "$inn_newslbin"
 
 scan "@NEWSUMASK@" "%o" inn_umask
-umask @NEWSUMASK@
+catch {umask @NEWSUMASK@}
 
 set inn_syslog_facility [ exec echo [string tolower "@SYSLOG_FACILITY@"] | $inn_sed -e {s/log_//} ]
 




More information about the inn-committers mailing list