[evolvis-commits] r6915: another round of include_path changes to include Debian’s defaults↵

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Sep 6 15:52:17 CEST 2010


Author: mirabilos
Date: 2010-09-06 15:52:17 +0200 (Mon, 06 Sep 2010)
New Revision: 6915

Modified:
   trunk/gforge_base/evolvisforge/gforge/cron.d/00phpcron
   trunk/gforge_base/evolvisforge/gforge/debian/changelog
   trunk/gforge_base/evolvisforge/gforge/www/env.inc.php
Log:
another round of include_path changes to include Debian’s defaults


Modified: trunk/gforge_base/evolvisforge/gforge/cron.d/00phpcron
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/cron.d/00phpcron	2010-09-06 13:03:28 UTC (rev 6914)
+++ trunk/gforge_base/evolvisforge/gforge/cron.d/00phpcron	2010-09-06 13:52:17 UTC (rev 6915)
@@ -6,8 +6,8 @@
 # Don't reference $GFORGE because this won't work!
 # You may need to change the pathname to php CLI (command line interface)
 ETCGFORGE=/etc/gforge
-INCLUDE_PATH=/etc/gforge:/usr/share/gforge/:/usr/share/gforge/www:/usr/share/gforge/common
-PHP="/usr/bin/php -q -d include_path=.:/etc/gforge:/usr/share/gforge:/usr/share/gforge/www/include"
+INCLUDE_PATH=/etc/gforge:/usr/share/gforge/:/usr/share/gforge/www:/usr/share/gforge/common:/usr/share/php:/usr/share/pear
+PHP="/usr/bin/php -q -d include_path=.:/etc/gforge:/usr/share/gforge:/usr/share/gforge/www/include:/usr/share/php:/usr/share/pear"
 
 # Don't mail command output to anyone.
 MAILTO=""

Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-09-06 13:03:28 UTC (rev 6914)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-09-06 13:52:17 UTC (rev 6915)
@@ -16,8 +16,9 @@
     renaming; fix some shortcomings and apply it everywhere
   * Raise gforge-web-apache2 version number for Debian sid
     compatibility (python-2.6-minimal Breaks older versions)
+  * Improve include_path once again (env.inc.php and cron)
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Mon, 30 Aug 2010 10:56:34 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Tue, 31 Aug 2010 13:18:15 +0200
 
 gforge (4.8.3+evolvis24) unstable; urgency=low
 

Modified: trunk/gforge_base/evolvisforge/gforge/www/env.inc.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/env.inc.php	2010-09-06 13:03:28 UTC (rev 6914)
+++ trunk/gforge_base/evolvisforge/gforge/www/env.inc.php	2010-09-06 13:52:17 UTC (rev 6915)
@@ -9,8 +9,24 @@
 
 # Attempt to set up the include path, to fix problems with relative includes
 $fusionforge_basedir = dirname(dirname( __FILE__ )) ;
-$include_path = join(PATH_SEPARATOR, 
-	array("/etc/gforge/custom", "/etc/gforge", "$fusionforge_basedir/common", "$fusionforge_basedir/www",	"$fusionforge_basedir/plugins", "$fusionforge_basedir", "."));
+$include_path = array(
+	"/etc/gforge/custom",
+	"/etc/gforge",
+	"$fusionforge_basedir/common",
+	"$fusionforge_basedir/www",
+	"$fusionforge_basedir/plugins",
+	"$fusionforge_basedir",
+	".",
+	/* Debian */
+	"/usr/share/php",
+	"/usr/share/pear"
+    );
+$x = array();
+foreach ($include_path as $y) {
+	if (file_exists($y . "/."))
+		$x[] = $y;
+}
+$include_path = join(PATH_SEPARATOR, $x);
 
 // By default, the include_path is changed to include path needed by Gforge.
 // If this does not work, then set defines to real path directly.



More information about the evolvis-commits mailing list