[Pkg-zenoss-commits] r280 - in /trunk/packages/zenoss/debian/patches: 00list zendmd_history_location.dpatch

[zack at users.alioth.debian.org]

Author: zack
Date: Mon Aug 13 15:48:48 2007
New Revision: 280

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=280
Log:
avoid conflicts w other patches

Modified:
    trunk/packages/zenoss/debian/patches/00list
    trunk/packages/zenoss/debian/patches/zendmd_history_location.dpatch

Modified: trunk/packages/zenoss/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/00list?rev=280&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/00list (original)
+++ trunk/packages/zenoss/debian/patches/00list Mon Aug 13 15:48:48 2007
@@ -2,7 +2,6 @@
 testgen-distutils
 drop_triggers_before_db_creation
 bypass_eula
-zendmd_history_location
 ZENHOME00-shellscripts
 ZENHOME01-zenfunctions-pythonpath
 ZENHOME02-add-missing-zenfunction-source
@@ -16,3 +15,4 @@
 bin-zenoss-fix
 ZenossInfo-rrd-version
 renderserver-cache-dir
+zendmd_history_location

Modified: trunk/packages/zenoss/debian/patches/zendmd_history_location.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/zendmd_history_location.dpatch?rev=280&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/zendmd_history_location.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/zendmd_history_location.dpatch Mon Aug 13 15:48:48 2007
@@ -2,17 +2,16 @@
 ## zendmd_history_location.dpatch by Stefano Zacchiroli <zack at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: save .pyhistory in a subdir of the zenoss user home which is writable to
-## DP: the user
+## DP: save history under ~/var/, since ~/ is not writable
 
 @DPATCH@
 diff -urNad zenoss~/Products/ZenModel/zendmd.py zenoss/Products/ZenModel/zendmd.py
---- zenoss~/Products/ZenModel/zendmd.py	2007-06-26 18:11:51.000000000 +0200
-+++ zenoss/Products/ZenModel/zendmd.py	2007-08-13 17:36:41.000000000 +0200
+--- zenoss~/Products/ZenModel/zendmd.py	2007-08-13 17:45:30.000000000 +0200
++++ zenoss/Products/ZenModel/zendmd.py	2007-08-13 17:45:47.000000000 +0200
 @@ -35,7 +35,7 @@
      # original code is available at http://pastebin.adytum.us/40 though
      # the original has proven difficult to locate.
-     zenHome = os.getenv('ZENHOME')
+     zenHome = pwd.getpwnam('zenoss')[5]
 -    historyPath = os.path.join(zenHome, '.pyhistory')
 +    historyPath = os.path.join(zenHome, 'var', '.pyhistory')
      def save_history(historyPath=historyPath):