[interchange-cvs] interchange - racke modified 4 files

[interchange-core@icdevgroup.org]

User:      racke
Date:      2003-06-18 14:21:02 GMT
Modified:  debian   interchange.config interchange.init
Modified:           interchange.templates
Modified:  scripts  interchange.PL
Log:
workaround for thread check to allow releasing Interchange 4.9.8
as official Debian package

Revision  Changes    Path
2.7       +6 -0      interchange/debian/interchange.config


rev 2.7, prev_rev 2.6
Index: interchange.config
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange.config,v
retrieving revision 2.6
retrieving revision 2.7
diff -u -r2.6 -r2.7
--- interchange.config	10 Apr 2003 01:00:40 -0000	2.6
+++ interchange.config	18 Jun 2003 14:21:01 -0000	2.7
@@ -20,6 +20,12 @@
 # Source debconf library
 . /usr/share/debconf/confmodule
 
+# Check for thread enabled Perl
+PERLTHREADS=`perl -MConfig -e 'print $Config{usethreads} || $Config{useithreads} || $Config{use5005threads}'`
+if [ "$PERLTHREADS" ]; then
+	db_input critical interchange/threadenabledperl || true
+fi
+
 if [ -e /etc/interchange/init.cfg ]; then
 	# Read current state from configuration file
 	. /etc/interchange/init.cfg || true



2.6       +1 -0      interchange/debian/interchange.init


rev 2.6, prev_rev 2.5
Index: interchange.init
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange.init,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -r2.5 -r2.6
--- interchange.init	29 May 2003 00:24:22 -0000	2.5
+++ interchange.init	18 Jun 2003 14:21:01 -0000	2.6
@@ -38,6 +38,7 @@
 if [ "$GPGHOME" ]; then
 	export GNUPGHOME=$GPGHOME
 fi
+export MINIVEND_FORCE_THREADS=1
 
 case "$1" in
   start)



2.5       +11 -0     interchange/debian/interchange.templates


rev 2.5, prev_rev 2.4
Index: interchange.templates
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange.templates,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -r2.4 -r2.5
--- interchange.templates	10 Apr 2003 01:00:40 -0000	2.4
+++ interchange.templates	18 Jun 2003 14:21:01 -0000	2.5
@@ -109,3 +109,14 @@
  /etc/interchange/robots.cfg for the directives RobotUA, RobotIP
  and RobotHost. It is recommended to include these settings so
  Interchange can distinguish between robots and ordinary users.
+
+Template: interchange/threadenabledperl
+Type: note
+Description: Important Perl Incompatibility
+ The authors of Interchange strongly disencourage the use of their
+ software on top of a thread enabled Perl. It is likely to cause
+ serious problems, especially in high load situations, and has no
+ benefit at all for Interchange servers.
+ The development team asserts that the thread-safeness of Perl and the 
+ bunch of modules Interchange uses can hardly relied upon.
+ Please use this package only for testing and debugging purposes.



2.73      +3 -2      interchange/scripts/interchange.PL


rev 2.73, prev_rev 2.72
Index: interchange.PL
===================================================================
RCS file: /anon_cvs/repository/interchange/scripts/interchange.PL,v
retrieving revision 2.72
retrieving revision 2.73
diff -u -r2.72 -r2.73
--- interchange.PL	13 May 2003 19:05:18 -0000	2.72
+++ interchange.PL	18 Jun 2003 14:21:02 -0000	2.73
@@ -3,7 +3,7 @@
 #
 # Interchange version 4.9.7
 #
-# $Id: interchange.PL,v 2.72 2003/05/13 19:05:18 mheins Exp $
+# $Id: interchange.PL,v 2.73 2003/06/18 14:21:02 racke Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. and others.
 # http://www.icdevgroup.org/
@@ -38,7 +38,8 @@
 use Config;
 
 BEGIN {
-	if($Config{usethreads} || $Config{useithreads} || $Config{use5005threads}) {
+	if(! $ENV{MINIVEND_FORCE_THREADS}
+	   && ($Config{usethreads} || $Config{useithreads} || $Config{use5005threads})) {
 		die "Interchange will not work with a thread-enabled perl.\n";
 	}
 }