From b54473de98a4cb8f7c658d3ba0e4b2407619c136 Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 4 Oct 2010 08:26:42 +0000 Subject: [PATCH] Updated mapping patch git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19902 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../debian/patches/03_fix_class_mapping.patch | 62 ++++++------------- 1 file changed, 19 insertions(+), 43 deletions(-) diff --git a/gosa-core/debian/patches/03_fix_class_mapping.patch b/gosa-core/debian/patches/03_fix_class_mapping.patch index 81a720417..433e5d2d6 100644 --- a/gosa-core/debian/patches/03_fix_class_mapping.patch +++ b/gosa-core/debian/patches/03_fix_class_mapping.patch @@ -2,29 +2,29 @@ Author: Description: Fix location of auto-generated class mapping file Index: gosa/gosa-core/include/class_config.inc =================================================================== ---- gosa.orig/gosa-core/include/class_config.inc 2010-02-05 13:51:35.000000000 +0000 -+++ gosa/gosa-core/include/class_config.inc 2010-10-01 06:51:28.478555098 +0000 -@@ -100,12 +100,12 @@ - if we have installed or removed plugins. - */ - if(session::global_is_set("class_location.inc:timestamp")){ -- $tmp = stat("../include/class_location.inc"); -+ $tmp = stat("/var/cache/gosa/class.cache"); - if($tmp['mtime'] != session::global_get("class_location.inc:timestamp")){ - session::global_un_set("plist"); - } - } -- $tmp = stat("../include/class_location.inc"); -+ $tmp = stat("/var/cache/gosa/class.cache"); - session::global_set("class_location.inc:timestamp",$tmp['mtime']); +--- gosa.orig/gosa-core/include/class_config.inc 2010-08-27 17:52:28.000000000 +0200 ++++ gosa/gosa-core/include/class_config.inc 2010-10-04 12:21:31.000000000 +0200 +@@ -117,12 +117,12 @@ + if we have installed or removed plugins. + */ + if(session::global_is_set("class_location.inc:timestamp")){ +- $tmp = stat("../include/class_location.inc"); ++ $tmp = stat("/var/cache/gosa/class.cache"); + if($tmp['mtime'] != session::global_get("class_location.inc:timestamp")){ + session::global_un_set("plist"); + } + } +- $tmp = stat("../include/class_location.inc"); ++ $tmp = stat("/var/cache/gosa/class.cache"); + session::global_set("class_location.inc:timestamp",$tmp['mtime']); - if($this->filename != "" && filemtime($this->filename) != $this->last_modified){ + if($this->filename != "" && filemtime($this->filename) != $this->last_modified){ Index: gosa/gosa-core/include/functions.inc =================================================================== ---- gosa.orig/gosa-core/include/functions.inc 2010-10-01 06:51:28.000000000 +0000 -+++ gosa/gosa-core/include/functions.inc 2010-10-01 06:51:55.250554318 +0000 +--- gosa.orig/gosa-core/include/functions.inc 2010-10-04 12:18:46.000000000 +0200 ++++ gosa/gosa-core/include/functions.inc 2010-10-04 12:20:38.000000000 +0200 @@ -73,7 +73,7 @@ - $svn_revision = '$Revision: 19652 $'; + $svn_revision = '$Revision: 19783 $'; /* Include required files */ -require_once("class_location.inc"); @@ -32,27 +32,3 @@ Index: gosa/gosa-core/include/functions.inc require_once ("functions_debug.inc"); require_once ("accept-to-gettext.inc"); -Index: gosa/gosa-core/update-gosa -=================================================================== ---- gosa.orig/gosa-core/update-gosa 2008-06-10 07:56:22.000000000 +0000 -+++ gosa/gosa-core/update-gosa 2010-10-01 06:51:28.481554589 +0000 -@@ -21,7 +21,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --define ("GOSA_HOME", dirname(__FILE__)); -+define ("GOSA_HOME", "/usr/share/gosa"); - define ("LOCALE_DIR", GOSA_HOME."/locale"); - define ("PLUGSTATE_DIR", GOSA_HOME."/state"); - -@@ -122,8 +122,8 @@ - function rescan_classes() - { - echo "Updating class cache...\n"; -- $class_mapping= get_classes(); -- $filename= GOSA_HOME."/include/class_location.inc"; -+ $class_mapping= get_classes("/usr/share/gosa"); -+ $filename= "/var/cache/gosa/class.cache"; - - /* Sanity checks */ - if (!file_exists($filename) || is_writable($filename)) { -- 2.30.2