[Pkg-zenoss-commits] r297 - in /trunk/packages/zenoss/debian/patches: 00list ZENHOME20-import-os.dpatch ZENHOME30-os.environ.dpatch ZENHOME40-os.getent.dpatch ZENHOME60-rm-extra-check-in-zenbuild.dpatch ZENHOME90-rest-Products.dpatch
bzed-guest at users.alioth.debian.org
bzed-guest at users.alioth.debian.org
Mon Sep 24 18:11:14 UTC 2007
Author: bzed-guest
Date: Mon Sep 24 18:11:14 2007
New Revision: 297
URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=297
Log:
patch updates
Removed:
trunk/packages/zenoss/debian/patches/ZENHOME20-import-os.dpatch
trunk/packages/zenoss/debian/patches/ZENHOME30-os.environ.dpatch
trunk/packages/zenoss/debian/patches/ZENHOME40-os.getent.dpatch
trunk/packages/zenoss/debian/patches/ZENHOME60-rm-extra-check-in-zenbuild.dpatch
Modified:
trunk/packages/zenoss/debian/patches/00list
trunk/packages/zenoss/debian/patches/ZENHOME90-rest-Products.dpatch
Modified: trunk/packages/zenoss/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/00list?rev=297&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/00list (original)
+++ trunk/packages/zenoss/debian/patches/00list Mon Sep 24 18:11:14 2007
@@ -6,11 +6,11 @@
ZENHOME01-zenfunctions-pythonpath
ZENHOME02-add-missing-zenfunction-source
ZENHOME10-zensocket-location
-ZENHOME20-import-os
-ZENHOME30-os.environ
-ZENHOME40-os.getent
+#ZENHOME20-import-os
+#ZENHOME30-os.environ
+#ZENHOME40-os.getent
ZENHOME50-zen2load
-ZENHOME60-rm-extra-check-in-zenbuild
+#ZENHOME60-rm-extra-check-in-zenbuild
ZENHOME90-rest-Products
bin-zenoss-fix
ZenossInfo-rrd-version
Modified: trunk/packages/zenoss/debian/patches/ZENHOME90-rest-Products.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME90-rest-Products.dpatch?rev=297&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME90-rest-Products.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME90-rest-Products.dpatch Mon Sep 24 18:11:14 2007
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad zenoss~/Products/ZenModel/help/Administration.stx zenoss/Products/ZenModel/help/Administration.stx
--- zenoss~/Products/ZenModel/help/Administration.stx 2004-05-18 22:37:04.000000000 +0200
-+++ zenoss/Products/ZenModel/help/Administration.stx 2007-09-07 00:30:58.000000000 +0200
++++ zenoss/Products/ZenModel/help/Administration.stx 2007-09-24 20:02:40.000000000 +0200
@@ -5,7 +5,7 @@
Environment
@@ -17,21 +17,9 @@
<p>SYBASE - path to the sybase install used to connect to netcool. Normally this is set automatically based on ZENHOME</p>
<p>ORACLE_HOME - path to the oracle client install used to connect to the netcool history database.</p>
-diff -urNad zenoss~/Products/ZenRRD/plugins/randomExample.py zenoss/Products/ZenRRD/plugins/randomExample.py
---- zenoss~/Products/ZenRRD/plugins/randomExample.py 2007-09-07 00:30:57.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/randomExample.py 2007-09-07 00:30:58.000000000 +0200
-@@ -31,7 +31,7 @@
-
- env = {}
- env.update(os.environ)
-- anyOldFile = random.choice(glob.glob('%(ZENHOME)s/perf/Devices/*/*.rrd' % env))
-+ anyOldFile = random.choice(glob.glob('%s/perf/Devices/*/*.rrd' % pwd.getpwnam('zenoss')[5]))
- basename=os.path.basename(anyOldFile[:-4])
- width=500
- height=100
diff -urNad zenoss~/Products/ZenUITests/tests/selenium/zentestsuite zenoss/Products/ZenUITests/tests/selenium/zentestsuite
--- zenoss~/Products/ZenUITests/tests/selenium/zentestsuite 2007-08-16 17:11:40.000000000 +0200
-+++ zenoss/Products/ZenUITests/tests/selenium/zentestsuite 2007-09-07 00:31:57.000000000 +0200
++++ zenoss/Products/ZenUITests/tests/selenium/zentestsuite 2007-09-24 20:02:40.000000000 +0200
@@ -10,6 +10,8 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -41,21 +29,26 @@
cd $ZENHOME/Products/
svn up
zenmigrate
-diff -urNad zenoss~/Products/ZenUtils/Graphics.py zenoss/Products/ZenUtils/Graphics.py
---- zenoss~/Products/ZenUtils/Graphics.py 2007-09-07 00:30:57.000000000 +0200
-+++ zenoss/Products/ZenUtils/Graphics.py 2007-09-07 00:30:58.000000000 +0200
-@@ -61,7 +61,7 @@
- import pwd, os, os.path
- config = os.path.join(pwd.getpwnam('zenoss')[5], 'lib/graphviz/config')
- if not os.path.exists(config) or os.path.getsize(config) == 0:
-- os.system("$ZENHOME/bin/dot -c")
-+ os.system("/usr/bin/dot -c")
- import pydot
- graph = pydot.graph_from_edges(edges, directed=directed)
- graph.ranksep = '1.5'
+diff -urNad zenoss~/Products/ZenUtils/Utils.py zenoss/Products/ZenUtils/Utils.py
+--- zenoss~/Products/ZenUtils/Utils.py 2007-09-24 16:10:05.000000000 +0200
++++ zenoss/Products/ZenUtils/Utils.py 2007-09-24 20:06:16.000000000 +0200
+@@ -21,6 +21,7 @@
+
+ import sys
+ import os
++import pwd
+ import types
+ import struct
+ import logging
+@@ -541,4 +542,4 @@
+
+ def zenPath(*args):
+ args = [a.strip('/') for a in args]
+- return os.path.join(os.environ['ZENHOME'], *args)
++ return os.path.join(pwd.getpwnam('zenoss')[5], *args)
diff -urNad zenoss~/Products/ZenUtils/ZenBackup.py zenoss/Products/ZenUtils/ZenBackup.py
---- zenoss~/Products/ZenUtils/ZenBackup.py 2007-09-07 00:30:57.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenBackup.py 2007-09-07 00:30:58.000000000 +0200
+--- zenoss~/Products/ZenUtils/ZenBackup.py 2007-07-05 22:09:00.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenBackup.py 2007-09-24 20:02:40.000000000 +0200
@@ -126,7 +126,7 @@
default=None,
help='File to backup to.'
@@ -66,47 +59,8 @@
dest="noEventsDb",
default=False,
diff -urNad zenoss~/Products/ZenUtils/zenpack.py zenoss/Products/ZenUtils/zenpack.py
---- zenoss~/Products/ZenUtils/zenpack.py 2007-09-07 00:30:57.000000000 +0200
-+++ zenoss/Products/ZenUtils/zenpack.py 2007-09-07 00:30:58.000000000 +0200
-@@ -199,15 +199,15 @@
-
- # Continue without copying if the srcDir is already in Products
- if os.path.exists(root) and os.path.samefile(root, srcDir):
-- self.log.debug('Directory already in $ZENHOME/Products,'
-- ' not copying.')
-+ self.log.debug('Directory already in %s/Products,' % pwd.getpwnam('zenoss')[5],
-+ 'not copying.')
- return packName
-
- # Copy the source dir over to Products
- self.log.debug('Copying %s' % packName)
-- result = os.system('cp -r %s $ZENHOME/Products/' % srcDir)
-+ result = os.system('cp -r %s %s/Products/' % (srcDir, pwd.getpwnam('zenoss')[5]))
- if result == -1:
-- self.stop('Error copying %s to $ZENHOME/Products' % srcDir)
-+ self.stop('Error copying %s to %s/Products' % (srcDir, pwd.getpwnam('zenoss')[5]))
-
- return packName
-
-@@ -233,14 +233,14 @@
-
- # Continue without copying if the srcDir is already in Products
- if os.path.exists(root) and os.path.samefile(root, srcDir):
-- self.log.debug('Directory already in $ZENHOME/Products,'
-- ' not copying.')
-+ self.log.debug('Directory already in %s/Products,' % (pwd.getpwnam('zenoss')[5]),
-+ 'not copying.')
- return packName
-
-- targetdir = "$ZENHOME/Products/%s" % packName
-+ targetdir = "%s/Products/%s" % (pwd.getpwnam('zenoss')[5], packName)
- cmd = 'test -d %s && rm -rf %s' % (targetdir, targetdir)
- r = os.system(cmd)
-- cmd = 'ln -s %s $ZENHOME/Products' % srcDir
-+ cmd = 'ln -s %s %s/Products' % (srcDir, pwd.getpwnam('zenoss')[5])
- r = os.system(cmd)
-
- return packName
+--- zenoss~/Products/ZenUtils/zenpack.py 2007-09-24 16:10:05.000000000 +0200
++++ zenoss/Products/ZenUtils/zenpack.py 2007-09-24 20:02:40.000000000 +0200
@@ -272,7 +272,7 @@
action="store_true",
default=False,
More information about the Pkg-zenoss-commits
mailing list