[Pkg-zenoss-commits] r158 - /packages/zenoss/trunk/debian/patches/remove-ZENHOME-shellscripts.dpatch
bzed-guest at users.alioth.debian.org
bzed-guest at users.alioth.debian.org
Tue Jun 19 10:57:32 UTC 2007
Author: bzed-guest
Date: Tue Jun 19 10:57:31 2007
New Revision: 158
URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=158
Log:
fixing patch to work with the new upstream
Modified:
packages/zenoss/trunk/debian/patches/remove-ZENHOME-shellscripts.dpatch
Modified: packages/zenoss/trunk/debian/patches/remove-ZENHOME-shellscripts.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/remove-ZENHOME-shellscripts.dpatch?rev=158&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/patches/remove-ZENHOME-shellscripts.dpatch (original)
+++ packages/zenoss/trunk/debian/patches/remove-ZENHOME-shellscripts.dpatch Tue Jun 19 10:57:31 2007
@@ -6,11 +6,11 @@
@DPATCH@
diff -urNad zenoss~/Products/ZenUtils/Graphics.py zenoss/Products/ZenUtils/Graphics.py
---- zenoss~/Products/ZenUtils/Graphics.py 2007-04-20 14:25:38.000000000 +0100
-+++ zenoss/Products/ZenUtils/Graphics.py 2007-06-15 16:14:03.000000000 +0100
+--- zenoss~/Products/ZenUtils/Graphics.py 2007-06-19 11:54:08.000000000 +0100
++++ zenoss/Products/ZenUtils/Graphics.py 2007-06-19 11:54:09.000000000 +0100
@@ -61,7 +61,7 @@
- import os, os.path
- config = os.path.join(os.environ['ZENHOME'], 'lib/graphviz/config')
+ import os, pwd, 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("$(getent passwd zenoss | cut -d : -f 6)/bin/dot -c")
@@ -19,7 +19,7 @@
graph.ranksep = '1.5'
diff -urNad zenoss~/Products/ZenUtils/ZenBackup.py zenoss/Products/ZenUtils/ZenBackup.py
--- zenoss~/Products/ZenUtils/ZenBackup.py 2007-06-04 20:32:10.000000000 +0100
-+++ zenoss/Products/ZenUtils/ZenBackup.py 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/Products/ZenUtils/ZenBackup.py 2007-06-19 11:54:09.000000000 +0100
@@ -126,7 +126,7 @@
default=None,
help='File to backup to.'
@@ -31,7 +31,7 @@
default=False,
diff -urNad zenoss~/Products/ZenUtils/ZenBackupBase.py zenoss/Products/ZenUtils/ZenBackupBase.py
--- zenoss~/Products/ZenUtils/ZenBackupBase.py 2007-06-04 20:32:10.000000000 +0100
-+++ zenoss/Products/ZenUtils/ZenBackupBase.py 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/Products/ZenUtils/ZenBackupBase.py 2007-06-19 11:54:09.000000000 +0100
@@ -87,7 +87,7 @@
def getRepozoPath(self):
@@ -42,8 +42,8 @@
'''
path = os.path.join(self.zenhome, 'bin', 'repozo.py')
diff -urNad zenoss~/Products/ZenUtils/zenpack.py zenoss/Products/ZenUtils/zenpack.py
---- zenoss~/Products/ZenUtils/zenpack.py 2007-05-31 15:07:08.000000000 +0100
-+++ zenoss/Products/ZenUtils/zenpack.py 2007-06-15 16:14:03.000000000 +0100
+--- zenoss~/Products/ZenUtils/zenpack.py 2007-06-19 11:54:08.000000000 +0100
++++ zenoss/Products/ZenUtils/zenpack.py 2007-06-19 11:54:09.000000000 +0100
@@ -149,7 +149,7 @@
# Continue without copying if the srcDir is already in Products
@@ -69,7 +69,7 @@
diff -urNad zenoss~/bin/fsrecover zenoss/bin/fsrecover
--- zenoss~/bin/fsrecover 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/fsrecover 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/fsrecover 2007-06-19 11:54:09.000000000 +0100
@@ -10,9 +10,9 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -84,7 +84,7 @@
PIDFILE=$VARDIR/ZEO_SERVER.pid
diff -urNad zenoss~/bin/zenactions zenoss/bin/zenactions
--- zenoss~/bin/zenactions 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenactions 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenactions 2007-06-19 11:54:09.000000000 +0100
@@ -10,9 +10,9 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -99,7 +99,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zenbackup zenoss/bin/zenbackup
--- zenoss~/bin/zenbackup 2007-05-22 19:04:11.000000000 +0100
-+++ zenoss/bin/zenbackup 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenbackup 2007-06-19 11:54:09.000000000 +0100
@@ -10,5 +10,5 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -110,7 +110,7 @@
+$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenUtils/ZenBackup.py "$CMD" $*
diff -urNad zenoss~/bin/zenbatchload zenoss/bin/zenbatchload
--- zenoss~/bin/zenbatchload 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenbatchload 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenbatchload 2007-06-19 11:54:09.000000000 +0100
@@ -10,5 +10,5 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -121,7 +121,7 @@
+$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenModel/BatchDeviceLoader.py "$CMD" $*
diff -urNad zenoss~/bin/zenbuild zenoss/bin/zenbuild
--- zenoss~/bin/zenbuild 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenbuild 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenbuild 2007-06-19 11:54:09.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -134,7 +134,7 @@
diff -urNad zenoss~/bin/zenchkrels zenoss/bin/zenchkrels
--- zenoss~/bin/zenchkrels 2007-04-26 19:57:02.000000000 +0100
-+++ zenoss/bin/zenchkrels 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenchkrels 2007-06-19 11:54:09.000000000 +0100
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -145,7 +145,7 @@
+$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenUtils/CheckRelations.py "$CMD" $*
diff -urNad zenoss~/bin/zenchkschema zenoss/bin/zenchkschema
--- zenoss~/bin/zenchkschema 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenchkschema 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenchkschema 2007-06-19 11:54:09.000000000 +0100
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -156,7 +156,7 @@
+$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/checkrel.py $*
diff -urNad zenoss~/bin/zencommand zenoss/bin/zencommand
--- zenoss~/bin/zencommand 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zencommand 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zencommand 2007-06-19 11:54:09.000000000 +0100
@@ -10,9 +10,9 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -171,7 +171,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zenctl zenoss/bin/zenctl
--- zenoss~/bin/zenctl 2007-05-21 16:15:27.000000000 +0100
-+++ zenoss/bin/zenctl 2007-06-15 16:15:40.000000000 +0100
++++ zenoss/bin/zenctl 2007-06-19 11:54:09.000000000 +0100
@@ -20,7 +20,7 @@
# description: Zenoss is a monitoring program written by Zenoss, Inc.
#
@@ -261,7 +261,7 @@
# run the post-script for firstboot and remove the firstboot flag
diff -urNad zenoss~/bin/zendevicedump zenoss/bin/zendevicedump
--- zenoss~/bin/zendevicedump 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zendevicedump 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zendevicedump 2007-06-19 11:54:09.000000000 +0100
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -272,7 +272,7 @@
+$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/ExportDevices.py "$CMD" $*
diff -urNad zenoss~/bin/zendeviceload zenoss/bin/zendeviceload
--- zenoss~/bin/zendeviceload 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zendeviceload 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zendeviceload 2007-06-19 11:54:09.000000000 +0100
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -283,7 +283,7 @@
+$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/ImportDevices.py "$CMD" $*
diff -urNad zenoss~/bin/zendisc zenoss/bin/zendisc
--- zenoss~/bin/zendisc 2007-05-11 20:04:45.000000000 +0100
-+++ zenoss/bin/zendisc 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zendisc 2007-06-19 11:54:09.000000000 +0100
@@ -10,10 +10,10 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -300,7 +300,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zendmd zenoss/bin/zendmd
--- zenoss~/bin/zendmd 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zendmd 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zendmd 2007-06-19 11:54:09.000000000 +0100
@@ -12,5 +12,5 @@
# For some reason the zenfunctions line eats part of $*. Store
@@ -311,7 +311,7 @@
+$PYTHON -i $(getent passwd zenoss | cut -d : -f 6)/Products/ZenModel/zendmd.py "$CMD" $*
diff -urNad zenoss~/bin/zendoc zenoss/bin/zendoc
--- zenoss~/bin/zendoc 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zendoc 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zendoc 2007-06-19 11:54:09.000000000 +0100
@@ -9,8 +9,8 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -328,7 +328,7 @@
+$(getent passwd zenoss | cut -d : -f 6)/bin/epydoc -o $(getent passwd zenoss | cut -d : -f 6)/zendocs/api -n Zenoss --inheritance listed $ZENPRODUCTS
diff -urNad zenoss~/bin/zendump zenoss/bin/zendump
--- zenoss~/bin/zendump 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zendump 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zendump 2007-06-19 11:54:09.000000000 +0100
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -339,7 +339,7 @@
+$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/ExportRM.py "$CMD" $*
diff -urNad zenoss~/bin/zeneventbuild zenoss/bin/zeneventbuild
--- zenoss~/bin/zeneventbuild 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zeneventbuild 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zeneventbuild 2007-06-19 11:54:09.000000000 +0100
@@ -10,12 +10,12 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -357,7 +357,7 @@
cd $EVTDB
diff -urNad zenoss~/bin/zeneventlog zenoss/bin/zeneventlog
--- zenoss~/bin/zeneventlog 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zeneventlog 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zeneventlog 2007-06-19 11:54:09.000000000 +0100
@@ -10,9 +10,9 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -372,7 +372,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zenfunctions zenoss/bin/zenfunctions
--- zenoss~/bin/zenfunctions 2007-05-11 20:04:45.000000000 +0100
-+++ zenoss/bin/zenfunctions 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenfunctions 2007-06-19 11:56:19.000000000 +0100
@@ -9,23 +9,23 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -386,9 +386,11 @@
export SYBASE
-ZOPEHOME=$ZENHOME
+-if [ -d /usr/lib/zope ] ; then
+- ZOPEHOME=/usr/lib/zope
+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
@@ -405,7 +407,7 @@
diff -urNad zenoss~/bin/zenhub zenoss/bin/zenhub
--- zenoss~/bin/zenhub 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenhub 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenhub 2007-06-19 11:54:09.000000000 +0100
@@ -10,9 +10,9 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -420,7 +422,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zenload zenoss/bin/zenload
--- zenoss~/bin/zenload 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenload 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenload 2007-06-19 11:54:09.000000000 +0100
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -430,8 +432,8 @@
+. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/ImportRM.py "$CMD" $*
diff -urNad zenoss~/bin/zenmail zenoss/bin/zenmail
---- zenoss~/bin/zenmail 2007-05-11 20:04:45.000000000 +0100
-+++ zenoss/bin/zenmail 2007-06-15 16:14:03.000000000 +0100
+--- zenoss~/bin/zenmail 2007-06-15 16:23:11.000000000 +0100
++++ zenoss/bin/zenmail 2007-06-19 11:55:21.000000000 +0100
@@ -10,10 +10,10 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -439,16 +441,16 @@
-. $ZENHOME/bin/zenfunctions
+. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
--SUDO="zensocket --listen=25 -- $ZENHOME/bin/python "
+-SUDO="$ZENHOME/bin/zensocket --listen=25 -- "
-PRGHOME=$ZENHOME/Products/ZenEvents
-+SUDO="zensocket --listen=25 -- $(getent passwd zenoss | cut -d : -f 6)/bin/python "
++SUDO="/usr/lib/zenoss/bin/zensocket --listen=25 -- "
+PRGHOME=$(getent passwd zenoss | cut -d : -f 6)/Products/ZenEvents
PRGNAME=zenmail.py
CFGFILE=$CFGDIR/zenmail.conf
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zenmib zenoss/bin/zenmib
--- zenoss~/bin/zenmib 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenmib 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenmib 2007-06-19 11:54:09.000000000 +0100
@@ -10,9 +10,9 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -463,7 +465,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zenmigrate zenoss/bin/zenmigrate
--- zenoss~/bin/zenmigrate 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenmigrate 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenmigrate 2007-06-19 11:54:09.000000000 +0100
@@ -12,5 +12,5 @@
# For some reason the zenfunctions line eats part of $*. Store
@@ -474,7 +476,7 @@
+$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenModel/migrate/zenmigrate.py "$CMD" $*
diff -urNad zenoss~/bin/zenmodeler zenoss/bin/zenmodeler
--- zenoss~/bin/zenmodeler 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenmodeler 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenmodeler 2007-06-19 11:54:09.000000000 +0100
@@ -10,10 +10,10 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -490,7 +492,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zenoss zenoss/bin/zenoss
--- zenoss~/bin/zenoss 2007-05-21 16:23:04.000000000 +0100
-+++ zenoss/bin/zenoss 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenoss 2007-06-19 11:54:09.000000000 +0100
@@ -19,7 +19,7 @@
#############################################################################
# Attempt to set ZENHOME if it is not already set, or bogus
@@ -549,7 +551,7 @@
diff -urNad zenoss~/bin/zenoss_init_post zenoss/bin/zenoss_init_post
--- zenoss~/bin/zenoss_init_post 2007-05-11 19:57:16.000000000 +0100
-+++ zenoss/bin/zenoss_init_post 2007-06-15 16:15:40.000000000 +0100
++++ zenoss/bin/zenoss_init_post 2007-06-19 11:54:09.000000000 +0100
@@ -31,11 +31,11 @@
export MYSQLPASS="**MYSQL_PASSWD**"
export MYSQLEVENTDB="**MYSQL_DATABASE**"
@@ -567,7 +569,7 @@
# add localhost as a device to zenoss
diff -urNad zenoss~/bin/zenoss_init_pre zenoss/bin/zenoss_init_pre
--- zenoss~/bin/zenoss_init_pre 2007-05-11 19:57:16.000000000 +0100
-+++ zenoss/bin/zenoss_init_pre 2007-06-15 16:15:40.000000000 +0100
++++ zenoss/bin/zenoss_init_pre 2007-06-19 11:54:09.000000000 +0100
@@ -30,14 +30,14 @@
export MYSQLPASS="**MYSQL_PASSWD**"
export MYSQLEVENTDB="**MYSQL_DATABASE**"
@@ -597,7 +599,7 @@
stop_zeodb
diff -urNad zenoss~/bin/zenoss_upgrade_post zenoss/bin/zenoss_upgrade_post
--- zenoss~/bin/zenoss_upgrade_post 2007-05-11 19:57:16.000000000 +0100
-+++ zenoss/bin/zenoss_upgrade_post 2007-06-15 16:15:40.000000000 +0100
++++ zenoss/bin/zenoss_upgrade_post 2007-06-19 11:54:09.000000000 +0100
@@ -30,10 +30,10 @@
export MYSQLPASS="**MYSQL_PASSWD**"
export MYSQLEVENTDB="**MYSQL_DATABASE**"
@@ -614,7 +616,7 @@
# do nothing... this is left here for others to fill in later
diff -urNad zenoss~/bin/zenoss_upgrade_pre zenoss/bin/zenoss_upgrade_pre
--- zenoss~/bin/zenoss_upgrade_pre 2007-05-11 19:57:16.000000000 +0100
-+++ zenoss/bin/zenoss_upgrade_pre 2007-06-15 16:15:40.000000000 +0100
++++ zenoss/bin/zenoss_upgrade_pre 2007-06-19 11:54:09.000000000 +0100
@@ -30,11 +30,11 @@
export MYSQLPASS="**MYSQL_PASSWD**"
export MYSQLEVENTDB="**MYSQL_DATABASE**"
@@ -632,7 +634,7 @@
# already exist (we don't want to clobber people's configs)
diff -urNad zenoss~/bin/zenpack zenoss/bin/zenpack
--- zenoss~/bin/zenpack 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenpack 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenpack 2007-06-19 11:54:09.000000000 +0100
@@ -10,5 +10,5 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -643,7 +645,7 @@
+$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenUtils/zenpack.py "$CMD" $*
diff -urNad zenoss~/bin/zenpass zenoss/bin/zenpass
--- zenoss~/bin/zenpass 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenpass 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenpass 2007-06-19 11:54:09.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -674,7 +676,7 @@
done
diff -urNad zenoss~/bin/zenperfsnmp zenoss/bin/zenperfsnmp
--- zenoss~/bin/zenperfsnmp 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenperfsnmp 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenperfsnmp 2007-06-19 11:54:09.000000000 +0100
@@ -10,9 +10,9 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -689,7 +691,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zenperfxmlrpc zenoss/bin/zenperfxmlrpc
--- zenoss~/bin/zenperfxmlrpc 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenperfxmlrpc 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenperfxmlrpc 2007-06-19 11:54:09.000000000 +0100
@@ -10,9 +10,9 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -704,7 +706,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zenping zenoss/bin/zenping
--- zenoss~/bin/zenping 2007-05-11 20:04:45.000000000 +0100
-+++ zenoss/bin/zenping 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenping 2007-06-19 11:54:09.000000000 +0100
@@ -10,10 +10,10 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -721,7 +723,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zenprocess zenoss/bin/zenprocess
--- zenoss~/bin/zenprocess 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenprocess 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenprocess 2007-06-19 11:54:09.000000000 +0100
@@ -10,9 +10,9 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -736,7 +738,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zenprodrm zenoss/bin/zenprodrm
--- zenoss~/bin/zenprodrm 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenprodrm 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenprodrm 2007-06-19 11:54:09.000000000 +0100
@@ -16,9 +16,9 @@
echo No actions taken.
exit
@@ -751,7 +753,7 @@
do
diff -urNad zenoss~/bin/zenrender zenoss/bin/zenrender
--- zenoss~/bin/zenrender 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenrender 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenrender 2007-06-19 11:54:09.000000000 +0100
@@ -10,9 +10,9 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -766,7 +768,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zenrestore zenoss/bin/zenrestore
--- zenoss~/bin/zenrestore 2007-05-22 19:04:11.000000000 +0100
-+++ zenoss/bin/zenrestore 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenrestore 2007-06-19 11:54:09.000000000 +0100
@@ -10,5 +10,5 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -777,7 +779,7 @@
+$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenUtils/ZenRestore.py "$CMD" $*
diff -urNad zenoss~/bin/zenschamadoc zenoss/bin/zenschamadoc
--- zenoss~/bin/zenschamadoc 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenschamadoc 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenschamadoc 2007-06-19 11:54:09.000000000 +0100
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -788,7 +790,7 @@
+$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/schemadoc.py Products.ZenModel
diff -urNad zenoss~/bin/zenstatus zenoss/bin/zenstatus
--- zenoss~/bin/zenstatus 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenstatus 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenstatus 2007-06-19 11:54:09.000000000 +0100
@@ -10,9 +10,9 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -803,7 +805,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zenstep zenoss/bin/zenstep
--- zenoss~/bin/zenstep 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenstep 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenstep 2007-06-19 11:54:09.000000000 +0100
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -814,7 +816,7 @@
+$(getent passwd zenoss | cut -d : -f 6)/bin/python $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRRD/zenstep.py $@
diff -urNad zenoss~/bin/zensyslog zenoss/bin/zensyslog
--- zenoss~/bin/zensyslog 2007-05-11 20:04:45.000000000 +0100
-+++ zenoss/bin/zensyslog 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zensyslog 2007-06-19 11:54:09.000000000 +0100
@@ -10,10 +10,10 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -831,7 +833,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zentrap zenoss/bin/zentrap
--- zenoss~/bin/zentrap 2007-05-11 20:04:45.000000000 +0100
-+++ zenoss/bin/zentrap 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zentrap 2007-06-19 11:54:09.000000000 +0100
@@ -10,10 +10,10 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -848,7 +850,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zenwin zenoss/bin/zenwin
--- zenoss~/bin/zenwin 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenwin 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenwin 2007-06-19 11:54:09.000000000 +0100
@@ -10,9 +10,9 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -863,7 +865,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zenwinmodeler zenoss/bin/zenwinmodeler
--- zenoss~/bin/zenwinmodeler 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zenwinmodeler 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zenwinmodeler 2007-06-19 11:54:09.000000000 +0100
@@ -10,9 +10,9 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -878,7 +880,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/bin/zproprmlocal zenoss/bin/zproprmlocal
--- zenoss~/bin/zproprmlocal 2007-04-20 14:48:17.000000000 +0100
-+++ zenoss/bin/zproprmlocal 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/bin/zproprmlocal 2007-06-19 11:54:09.000000000 +0100
@@ -10,10 +10,10 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -894,7 +896,7 @@
PIDFILE=$VARDIR/$PRGNAME.pid
diff -urNad zenoss~/zenpacks/DnsMonitor/datasources/DnsMonitorDataSource.py zenoss/zenpacks/DnsMonitor/datasources/DnsMonitorDataSource.py
--- zenoss~/zenpacks/DnsMonitor/datasources/DnsMonitorDataSource.py 2007-06-11 18:52:15.000000000 +0100
-+++ zenoss/zenpacks/DnsMonitor/datasources/DnsMonitorDataSource.py 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/zenpacks/DnsMonitor/datasources/DnsMonitorDataSource.py 2007-06-19 11:54:09.000000000 +0100
@@ -81,7 +81,7 @@
if self.expectedIpAddress:
parts.append('-a %s' % self.expectedIpAddress)
@@ -906,7 +908,7 @@
diff -urNad zenoss~/zenpacks/HttpMonitor/datasources/HttpMonitorDataSource.py zenoss/zenpacks/HttpMonitor/datasources/HttpMonitorDataSource.py
--- zenoss~/zenpacks/HttpMonitor/datasources/HttpMonitorDataSource.py 2007-06-11 18:46:39.000000000 +0100
-+++ zenoss/zenpacks/HttpMonitor/datasources/HttpMonitorDataSource.py 2007-06-15 16:14:03.000000000 +0100
++++ zenoss/zenpacks/HttpMonitor/datasources/HttpMonitorDataSource.py 2007-06-19 11:54:09.000000000 +0100
@@ -114,7 +114,7 @@
if self.onRedirect:
parts.append('-f %s' % self.onRedirect)
More information about the Pkg-zenoss-commits
mailing list