[Pkg-zenoss-commits] r298 - in /trunk/packages/zenoss/debian/patches: 00list ZENHOME90-Products.dpatch ZENHOME90-rest-Products.dpatch ZenossInfo-rrd-version.dpatch zendmd_history_location.dpatch

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

Author: bzed-guest
Date: Mon Sep 24 18:26:16 2007
New Revision: 298

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

Added:
    trunk/packages/zenoss/debian/patches/ZENHOME90-Products.dpatch
      - copied unchanged from r297, trunk/packages/zenoss/debian/patches/ZENHOME90-rest-Products.dpatch
Removed:
    trunk/packages/zenoss/debian/patches/ZENHOME90-rest-Products.dpatch
Modified:
    trunk/packages/zenoss/debian/patches/00list
    trunk/packages/zenoss/debian/patches/ZenossInfo-rrd-version.dpatch
    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=298&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/00list (original)
+++ trunk/packages/zenoss/debian/patches/00list Mon Sep 24 18:26:16 2007
@@ -6,13 +6,10 @@
 ZENHOME01-zenfunctions-pythonpath
 ZENHOME02-add-missing-zenfunction-source
 ZENHOME10-zensocket-location
-#ZENHOME20-import-os
-#ZENHOME30-os.environ
-#ZENHOME40-os.getent
 ZENHOME50-zen2load
-#ZENHOME60-rm-extra-check-in-zenbuild
-ZENHOME90-rest-Products
+ZENHOME90-Products
 bin-zenoss-fix
 ZenossInfo-rrd-version
 renderserver-cache-dir
 zendmd_history_location
+pysnmp-v3-env

Modified: trunk/packages/zenoss/debian/patches/ZenossInfo-rrd-version.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZenossInfo-rrd-version.dpatch?rev=298&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZenossInfo-rrd-version.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZenossInfo-rrd-version.dpatch Mon Sep 24 18:26:16 2007
@@ -7,13 +7,13 @@
 
 @DPATCH@
 diff -urNad zenoss~/Products/ZenModel/ZenossInfo.py zenoss/Products/ZenModel/ZenossInfo.py
---- zenoss~/Products/ZenModel/ZenossInfo.py	2007-09-07 00:33:16.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenossInfo.py	2007-09-07 00:33:17.000000000 +0200
-@@ -179,13 +179,11 @@
+--- zenoss~/Products/ZenModel/ZenossInfo.py	2007-09-24 16:10:05.000000000 +0200
++++ zenoss/Products/ZenModel/ZenossInfo.py	2007-09-24 20:15:51.000000000 +0200
+@@ -180,13 +180,11 @@
              v = Version(*getRRDToolVersion())
              v.full()
          """
--        cmd = os.path.join(pwd.getpwnam('zenoss')[5], 'bin', 'rrdtool')
+-        cmd = zenPath('bin', 'rrdtool')
 -        if not os.path.exists(cmd):
 -            cmd = 'rrdtool'
 -        fd = os.popen(cmd)

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=298&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/zendmd_history_location.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/zendmd_history_location.dpatch Mon Sep 24 18:26:16 2007
@@ -6,13 +6,13 @@
 
 @DPATCH@
 diff -urNad zenoss~/Products/ZenModel/zendmd.py zenoss/Products/ZenModel/zendmd.py
---- 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 @@
+--- zenoss~/Products/ZenModel/zendmd.py	2007-09-24 16:39:48.000000000 +0200
++++ zenoss/Products/ZenModel/zendmd.py	2007-09-24 20:19:09.000000000 +0200
+@@ -36,7 +36,7 @@
      # original code is available at http://pastebin.adytum.us/40 though
      # the original has proven difficult to locate.
-     zenHome = pwd.getpwnam('zenoss')[5]
--    historyPath = os.path.join(zenHome, '.pyhistory')
+     zenHome = zenPath()
+-    historyPath = zenPath('.pyhistory')
 +    historyPath = os.path.join(zenHome, 'var', '.pyhistory')
      def save_history(historyPath=historyPath):
          import readline