[Pkg-zenoss-commits] r140 - /packages/zenoss/trunk/debian/patches/zenfunctions-pythonpath.dpatch

[bzed-guest at users.alioth.debian.org]

Author: bzed-guest
Date: Sun Jun 17 16:45:57 2007
New Revision: 140

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=140
Log:
patch update

Modified:
    packages/zenoss/trunk/debian/patches/zenfunctions-pythonpath.dpatch

Modified: packages/zenoss/trunk/debian/patches/zenfunctions-pythonpath.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/zenfunctions-pythonpath.dpatch?rev=140&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/patches/zenfunctions-pythonpath.dpatch (original)
+++ packages/zenoss/trunk/debian/patches/zenfunctions-pythonpath.dpatch Sun Jun 17 16:45:57 2007
@@ -6,16 +6,20 @@
 
 @DPATCH@
 diff -urNad zenoss~/bin/zenfunctions zenoss/bin/zenfunctions
---- zenoss~/bin/zenfunctions	2007-06-17 17:39:04.000000000 +0100
-+++ zenoss/bin/zenfunctions	2007-06-17 17:40:21.000000000 +0100
-@@ -20,8 +20,8 @@
-    ZOPEHOME=/usr/lib/zope
+--- zenoss~/bin/zenfunctions	2007-06-17 17:45:07.000000000 +0100
++++ zenoss/bin/zenfunctions	2007-06-17 17:45:45.000000000 +0100
+@@ -16,11 +16,11 @@
+ export SYBASE
+ 
+ ZOPEHOME=$(getent passwd zenoss | cut -d : -f 6)
+-if [ -d /usr/lib/zope ] ; then
+-   ZOPEHOME=/usr/lib/zope
++if [ -d /usr/lib/zope2.9 ] ; then
++   ZOPEHOME=/usr/lib/zope2.9
  fi
  
 -PYTHON=$ZOPEHOME/bin/python
--PYTHONPATH=$(getent passwd zenoss | cut -d : -f 6)/lib/python:$ZOPEHOME/lib/python
 +PYTHON=/usr/bin/python2.4
-+PYTHONPATH=$(getent passwd zenoss | cut -d : -f 6)/lib/python:$PYTHONPATH
+ PYTHONPATH=$(getent passwd zenoss | cut -d : -f 6)/lib/python:$ZOPEHOME/lib/python
  export PYTHONPATH
  
- VARDIR=$(getent passwd zenoss | cut -d : -f 6)/var