[Pkg-zenoss-commits] r289 - in /trunk/packages/zenoss/debian: ./ patches/
bzed-guest at users.alioth.debian.org
bzed-guest at users.alioth.debian.org
Thu Sep 6 22:33:56 UTC 2007
Author: bzed-guest
Date: Thu Sep 6 22:33:55 2007
New Revision: 289
URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=289
Log:
updating patches for the way to 2.1
Added:
trunk/packages/zenoss/debian/copyright.in
- copied unchanged from r287, trunk/packages/zenoss/debian/copyright
Modified:
trunk/packages/zenoss/debian/changelog
trunk/packages/zenoss/debian/patches/ZENHOME00-shellscripts.dpatch
trunk/packages/zenoss/debian/patches/ZENHOME02-add-missing-zenfunction-source.dpatch
trunk/packages/zenoss/debian/patches/ZENHOME10-zensocket-location.dpatch
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/ZENHOME50-zen2load.dpatch
trunk/packages/zenoss/debian/patches/ZENHOME60-rm-extra-check-in-zenbuild.dpatch
trunk/packages/zenoss/debian/patches/ZENHOME90-rest-Products.dpatch
trunk/packages/zenoss/debian/patches/ZenossInfo-rrd-version.dpatch
trunk/packages/zenoss/debian/rules-extras.mk
Modified: trunk/packages/zenoss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/changelog?rev=289&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/changelog (original)
+++ trunk/packages/zenoss/debian/changelog Thu Sep 6 22:33:55 2007
@@ -1,4 +1,4 @@
-zenoss (2.0.1~svn+r6387-1) UNRELEASED; urgency=low
+zenoss (2.0.1~svn+r6400-1) UNRELEASED; urgency=low
* Initial release (closes: #361253)
Modified: trunk/packages/zenoss/debian/patches/ZENHOME00-shellscripts.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME00-shellscripts.dpatch?rev=289&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME00-shellscripts.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME00-shellscripts.dpatch Thu Sep 6 22:33:55 2007
@@ -9,7 +9,7 @@
@DPATCH@
diff -urNad zenoss~/bin/fsrecover zenoss/bin/fsrecover
--- zenoss~/bin/fsrecover 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/fsrecover 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/fsrecover 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -21,7 +21,7 @@
PRGNAME=fsrecover.py
diff -urNad zenoss~/bin/zenactions zenoss/bin/zenactions
--- zenoss~/bin/zenactions 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenactions 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenactions 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -33,7 +33,7 @@
PRGNAME=zenactions.py
diff -urNad zenoss~/bin/zenbackup zenoss/bin/zenbackup
--- zenoss~/bin/zenbackup 2007-05-22 20:04:11.000000000 +0200
-+++ zenoss/bin/zenbackup 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenbackup 2007-09-07 00:11:14.000000000 +0200
@@ -10,5 +10,5 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -43,7 +43,7 @@
$PYTHON $ZENHOME/Products/ZenUtils/ZenBackup.py "$CMD" $*
diff -urNad zenoss~/bin/zenbatchload zenoss/bin/zenbatchload
--- zenoss~/bin/zenbatchload 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenbatchload 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenbatchload 2007-09-07 00:11:14.000000000 +0200
@@ -10,5 +10,5 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -53,7 +53,7 @@
$PYTHON $ZENHOME/Products/ZenModel/BatchDeviceLoader.py "$CMD" $*
diff -urNad zenoss~/bin/zenbuild zenoss/bin/zenbuild
--- zenoss~/bin/zenbuild 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenbuild 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenbuild 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -65,7 +65,7 @@
diff -urNad zenoss~/bin/zenchkrels zenoss/bin/zenchkrels
--- zenoss~/bin/zenchkrels 2007-04-26 20:57:02.000000000 +0200
-+++ zenoss/bin/zenchkrels 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenchkrels 2007-09-07 00:11:14.000000000 +0200
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -75,7 +75,7 @@
$PYTHON $ZENHOME/Products/ZenUtils/CheckRelations.py "$CMD" $*
diff -urNad zenoss~/bin/zenchkschema zenoss/bin/zenchkschema
--- zenoss~/bin/zenchkschema 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenchkschema 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenchkschema 2007-09-07 00:11:14.000000000 +0200
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -85,7 +85,7 @@
$PYTHON $ZENHOME/Products/ZenRelations/checkrel.py $*
diff -urNad zenoss~/bin/zencommand zenoss/bin/zencommand
--- zenoss~/bin/zencommand 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zencommand 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zencommand 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -97,7 +97,7 @@
PRGNAME=zencommand.py
diff -urNad zenoss~/bin/zendevicedump zenoss/bin/zendevicedump
--- zenoss~/bin/zendevicedump 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zendevicedump 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zendevicedump 2007-09-07 00:11:14.000000000 +0200
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -107,7 +107,7 @@
$PYTHON $ZENHOME/Products/ZenRelations/ExportDevices.py "$CMD" $*
diff -urNad zenoss~/bin/zendeviceload zenoss/bin/zendeviceload
--- zenoss~/bin/zendeviceload 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zendeviceload 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zendeviceload 2007-09-07 00:11:14.000000000 +0200
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -117,7 +117,7 @@
$PYTHON $ZENHOME/Products/ZenRelations/ImportDevices.py "$CMD" $*
diff -urNad zenoss~/bin/zendisc zenoss/bin/zendisc
--- zenoss~/bin/zendisc 2007-05-11 21:04:45.000000000 +0200
-+++ zenoss/bin/zendisc 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zendisc 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -129,7 +129,7 @@
PRGHOME=$ZENHOME/Products/DataCollector
diff -urNad zenoss~/bin/zendmd zenoss/bin/zendmd
--- zenoss~/bin/zendmd 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zendmd 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zendmd 2007-09-07 00:11:14.000000000 +0200
@@ -12,5 +12,5 @@
# For some reason the zenfunctions line eats part of $*. Store
@@ -139,7 +139,7 @@
$PYTHON -i $ZENHOME/Products/ZenModel/zendmd.py "$CMD" $*
diff -urNad zenoss~/bin/zendoc zenoss/bin/zendoc
--- zenoss~/bin/zendoc 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zendoc 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zendoc 2007-09-07 00:11:14.000000000 +0200
@@ -9,7 +9,7 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -151,7 +151,7 @@
cd $ZENHOME/Products
diff -urNad zenoss~/bin/zendump zenoss/bin/zendump
--- zenoss~/bin/zendump 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zendump 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zendump 2007-09-07 00:11:14.000000000 +0200
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -161,7 +161,7 @@
$PYTHON $ZENHOME/Products/ZenRelations/ExportRM.py "$CMD" $*
diff -urNad zenoss~/bin/zeneventlog zenoss/bin/zeneventlog
--- zenoss~/bin/zeneventlog 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zeneventlog 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zeneventlog 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -171,22 +171,9 @@
PRGHOME=$ZENHOME/Products/ZenWin
PRGNAME=zeneventlog.py
-diff -urNad zenoss~/bin/zenfunctions zenoss/bin/zenfunctions
---- zenoss~/bin/zenfunctions 2007-05-11 21:04:45.000000000 +0200
-+++ zenoss/bin/zenfunctions 2007-07-22 11:07:54.000000000 +0200
-@@ -9,6 +9,9 @@
- # For complete information please visit: http://www.zenoss.com/oss/
- #############################################################################
-
-+ZENHOME=$(getent passwd zenoss | cut -d : -f 6)
-+export ZENHOME
-+
- INSTANCE_HOME=$ZENHOME
- export INSTANCE_HOME
-
diff -urNad zenoss~/bin/zenhub zenoss/bin/zenhub
--- zenoss~/bin/zenhub 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenhub 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenhub 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -198,7 +185,7 @@
PRGNAME=zenhub.py
diff -urNad zenoss~/bin/zenload zenoss/bin/zenload
--- zenoss~/bin/zenload 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenload 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenload 2007-09-07 00:11:14.000000000 +0200
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -208,7 +195,7 @@
$PYTHON $ZENHOME/Products/ZenRelations/ImportRM.py "$CMD" $*
diff -urNad zenoss~/bin/zenmail zenoss/bin/zenmail
--- zenoss~/bin/zenmail 2007-07-10 20:56:40.000000000 +0200
-+++ zenoss/bin/zenmail 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenmail 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -220,7 +207,7 @@
PRGHOME=$ZENHOME/Products/ZenEvents
diff -urNad zenoss~/bin/zenmib zenoss/bin/zenmib
--- zenoss~/bin/zenmib 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenmib 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenmib 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -232,7 +219,7 @@
PRGNAME=zenmib.py
diff -urNad zenoss~/bin/zenmigrate zenoss/bin/zenmigrate
--- zenoss~/bin/zenmigrate 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenmigrate 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenmigrate 2007-09-07 00:11:14.000000000 +0200
@@ -12,5 +12,5 @@
# For some reason the zenfunctions line eats part of $*. Store
@@ -242,7 +229,7 @@
$PYTHON $ZENHOME/Products/ZenModel/migrate/zenmigrate.py "$CMD" $*
diff -urNad zenoss~/bin/zenmodeler zenoss/bin/zenmodeler
--- zenoss~/bin/zenmodeler 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenmodeler 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenmodeler 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -254,7 +241,7 @@
PRGHOME=$ZENHOME/Products/DataCollector
diff -urNad zenoss~/bin/zenoss zenoss/bin/zenoss
--- zenoss~/bin/zenoss 2007-07-10 20:56:55.000000000 +0200
-+++ zenoss/bin/zenoss 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenoss 2007-09-07 00:11:14.000000000 +0200
@@ -49,7 +49,7 @@
exec su - $USERNAME $0 $@
fi
@@ -266,7 +253,7 @@
C="$C zopectl"
diff -urNad zenoss~/bin/zenpack zenoss/bin/zenpack
--- zenoss~/bin/zenpack 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenpack 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenpack 2007-09-07 00:11:14.000000000 +0200
@@ -10,5 +10,5 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -276,7 +263,7 @@
$PYTHON $ZENHOME/Products/ZenUtils/zenpack.py "$CMD" $*
diff -urNad zenoss~/bin/zenperfsnmp zenoss/bin/zenperfsnmp
--- zenoss~/bin/zenperfsnmp 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenperfsnmp 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenperfsnmp 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -286,21 +273,9 @@
PRGHOME=$ZENHOME/Products/ZenRRD
PRGNAME=zenperfsnmp.py
-diff -urNad zenoss~/bin/zenperfxmlrpc zenoss/bin/zenperfxmlrpc
---- zenoss~/bin/zenperfxmlrpc 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenperfxmlrpc 2007-07-22 11:07:54.000000000 +0200
-@@ -10,7 +10,7 @@
- # For complete information please visit: http://www.zenoss.com/oss/
- #############################################################################
-
--. $ZENHOME/bin/zenfunctions
-+. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
-
- PRGHOME=$ZENHOME/Products/ZenRRD
- PRGNAME=zenperfxmlrpc.py
diff -urNad zenoss~/bin/zenping zenoss/bin/zenping
--- zenoss~/bin/zenping 2007-05-11 21:04:45.000000000 +0200
-+++ zenoss/bin/zenping 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenping 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -312,7 +287,7 @@
PRGHOME=$ZENHOME/Products/ZenStatus
diff -urNad zenoss~/bin/zenpop3 zenoss/bin/zenpop3
--- zenoss~/bin/zenpop3 2007-07-03 21:29:46.000000000 +0200
-+++ zenoss/bin/zenpop3 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenpop3 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -324,7 +299,7 @@
PRGHOME=$ZENHOME/Products/ZenEvents
diff -urNad zenoss~/bin/zenprocess zenoss/bin/zenprocess
--- zenoss~/bin/zenprocess 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenprocess 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenprocess 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -336,7 +311,7 @@
PRGNAME=zenprocess.py
diff -urNad zenoss~/bin/zenprodrm zenoss/bin/zenprodrm
--- zenoss~/bin/zenprodrm 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenprodrm 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenprodrm 2007-09-07 00:11:14.000000000 +0200
@@ -16,7 +16,7 @@
echo No actions taken.
exit
@@ -348,7 +323,7 @@
diff -urNad zenoss~/bin/zenrender zenoss/bin/zenrender
--- zenoss~/bin/zenrender 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenrender 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenrender 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -360,7 +335,7 @@
PRGNAME=zenrender.py
diff -urNad zenoss~/bin/zenrestore zenoss/bin/zenrestore
--- zenoss~/bin/zenrestore 2007-05-22 20:04:11.000000000 +0200
-+++ zenoss/bin/zenrestore 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenrestore 2007-09-07 00:11:14.000000000 +0200
@@ -10,5 +10,5 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -370,7 +345,7 @@
$PYTHON $ZENHOME/Products/ZenUtils/ZenRestore.py "$CMD" $*
diff -urNad zenoss~/bin/zenschamadoc zenoss/bin/zenschamadoc
--- zenoss~/bin/zenschamadoc 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenschamadoc 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenschamadoc 2007-09-07 00:11:14.000000000 +0200
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -380,7 +355,7 @@
$PYTHON $ZENHOME/Products/ZenRelations/schemadoc.py Products.ZenModel
diff -urNad zenoss~/bin/zenstatus zenoss/bin/zenstatus
--- zenoss~/bin/zenstatus 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenstatus 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenstatus 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -392,7 +367,7 @@
PRGNAME=zenstatus.py
diff -urNad zenoss~/bin/zensyslog zenoss/bin/zensyslog
--- zenoss~/bin/zensyslog 2007-07-03 21:28:36.000000000 +0200
-+++ zenoss/bin/zensyslog 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zensyslog 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -404,7 +379,7 @@
PRGHOME=$ZENHOME/Products/ZenEvents
diff -urNad zenoss~/bin/zentestcommand zenoss/bin/zentestcommand
--- zenoss~/bin/zentestcommand 2007-07-10 17:34:01.000000000 +0200
-+++ zenoss/bin/zentestcommand 2007-07-22 11:08:25.000000000 +0200
++++ zenoss/bin/zentestcommand 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -416,7 +391,7 @@
PRGNAME=zentestcommand.py
diff -urNad zenoss~/bin/zentrap zenoss/bin/zentrap
--- zenoss~/bin/zentrap 2007-07-03 21:28:36.000000000 +0200
-+++ zenoss/bin/zentrap 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zentrap 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -428,7 +403,7 @@
PRGHOME=$ZENHOME/Products/ZenEvents
diff -urNad zenoss~/bin/zenwin zenoss/bin/zenwin
--- zenoss~/bin/zenwin 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenwin 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenwin 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -440,7 +415,7 @@
PRGNAME=zenwin.py
diff -urNad zenoss~/bin/zenwinmodeler zenoss/bin/zenwinmodeler
--- zenoss~/bin/zenwinmodeler 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenwinmodeler 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zenwinmodeler 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -452,7 +427,7 @@
PRGNAME=zenwinmodeler.py
diff -urNad zenoss~/bin/zproprmlocal zenoss/bin/zproprmlocal
--- zenoss~/bin/zproprmlocal 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zproprmlocal 2007-07-22 11:07:54.000000000 +0200
++++ zenoss/bin/zproprmlocal 2007-09-07 00:11:14.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
Modified: trunk/packages/zenoss/debian/patches/ZENHOME02-add-missing-zenfunction-source.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME02-add-missing-zenfunction-source.dpatch?rev=289&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME02-add-missing-zenfunction-source.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME02-add-missing-zenfunction-source.dpatch Thu Sep 6 22:33:55 2007
@@ -5,9 +5,21 @@
## DP: No description.
@DPATCH@
+diff -urNad zenoss~/bin/zeneventbuild zenoss/bin/zeneventbuild
+--- zenoss~/bin/zeneventbuild 2007-04-20 15:48:17.000000000 +0200
++++ zenoss/bin/zeneventbuild 2007-09-07 00:14:01.000000000 +0200
+@@ -10,6 +10,8 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
++
+ if [ "$ZENHOME" = "" ]; then
+ echo ERROR: ZENHOME envrionment variable not set.
+ exit 1
diff -urNad zenoss~/bin/zenpass zenoss/bin/zenpass
--- zenoss~/bin/zenpass 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenpass 2007-07-09 13:50:24.000000000 +0200
++++ zenoss/bin/zenpass 2007-09-07 00:12:56.000000000 +0200
@@ -10,6 +10,8 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -19,7 +31,7 @@
echo -n 'Password for the Zenoss "admin" user: '
diff -urNad zenoss~/bin/zenstep zenoss/bin/zenstep
--- zenoss~/bin/zenstep 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenstep 2007-07-09 13:50:15.000000000 +0200
++++ zenoss/bin/zenstep 2007-09-07 00:12:56.000000000 +0200
@@ -9,5 +9,8 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
Modified: trunk/packages/zenoss/debian/patches/ZENHOME10-zensocket-location.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME10-zensocket-location.dpatch?rev=289&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME10-zensocket-location.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME10-zensocket-location.dpatch Thu Sep 6 22:33:55 2007
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad zenoss~/bin/zendisc zenoss/bin/zendisc
---- zenoss~/bin/zendisc 2007-07-09 12:37:58.000000000 +0200
-+++ zenoss/bin/zendisc 2007-07-09 12:39:21.000000000 +0200
+--- zenoss~/bin/zendisc 2007-09-07 00:22:38.000000000 +0200
++++ zenoss/bin/zendisc 2007-09-07 00:22:39.000000000 +0200
@@ -12,7 +12,7 @@
. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
@@ -18,8 +18,8 @@
PRGNAME=zendisc.py
CFGFILE=$CFGDIR/zendisc.conf
diff -urNad zenoss~/bin/zenmail zenoss/bin/zenmail
---- zenoss~/bin/zenmail 2007-07-09 12:37:58.000000000 +0200
-+++ zenoss/bin/zenmail 2007-07-09 12:39:21.000000000 +0200
+--- zenoss~/bin/zenmail 2007-09-07 00:22:38.000000000 +0200
++++ zenoss/bin/zenmail 2007-09-07 00:22:39.000000000 +0200
@@ -12,7 +12,7 @@
. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
@@ -30,8 +30,8 @@
PRGNAME=zenmail.py
CFGFILE=$CFGDIR/zenmail.conf
diff -urNad zenoss~/bin/zenping zenoss/bin/zenping
---- zenoss~/bin/zenping 2007-07-09 12:37:58.000000000 +0200
-+++ zenoss/bin/zenping 2007-07-09 12:39:21.000000000 +0200
+--- zenoss~/bin/zenping 2007-09-07 00:22:38.000000000 +0200
++++ zenoss/bin/zenping 2007-09-07 00:22:39.000000000 +0200
@@ -12,7 +12,7 @@
. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
@@ -42,8 +42,8 @@
PRGNAME=zenping.py
CFGFILE=$CFGDIR/zenping.conf
diff -urNad zenoss~/bin/zensyslog zenoss/bin/zensyslog
---- zenoss~/bin/zensyslog 2007-07-09 12:37:58.000000000 +0200
-+++ zenoss/bin/zensyslog 2007-07-09 12:39:21.000000000 +0200
+--- zenoss~/bin/zensyslog 2007-09-07 00:22:38.000000000 +0200
++++ zenoss/bin/zensyslog 2007-09-07 00:22:39.000000000 +0200
@@ -12,7 +12,7 @@
. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
@@ -54,8 +54,8 @@
PRGNAME=zensyslog.py
CFGFILE=$CFGDIR/zensyslog.conf
diff -urNad zenoss~/bin/zentrap zenoss/bin/zentrap
---- zenoss~/bin/zentrap 2007-07-09 12:37:58.000000000 +0200
-+++ zenoss/bin/zentrap 2007-07-09 12:39:21.000000000 +0200
+--- zenoss~/bin/zentrap 2007-09-07 00:22:38.000000000 +0200
++++ zenoss/bin/zentrap 2007-09-07 00:22:39.000000000 +0200
@@ -12,7 +12,7 @@
. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
Modified: trunk/packages/zenoss/debian/patches/ZENHOME20-import-os.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME20-import-os.dpatch?rev=289&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME20-import-os.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME20-import-os.dpatch Thu Sep 6 22:33:55 2007
@@ -8,7 +8,7 @@
@DPATCH@
diff -urNad zenoss~/Products/ZenEvents/zensendsyslog.py zenoss/Products/ZenEvents/zensendsyslog.py
--- zenoss~/Products/ZenEvents/zensendsyslog.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenEvents/zensendsyslog.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenEvents/zensendsyslog.py 2007-09-07 00:25:41.000000000 +0200
@@ -11,7 +11,7 @@
#
###########################################################################
@@ -19,8 +19,8 @@
import time
import Globals
diff -urNad zenoss~/Products/ZenEvents/zensyslog.py zenoss/Products/ZenEvents/zensyslog.py
---- zenoss~/Products/ZenEvents/zensyslog.py 2007-07-13 21:03:51.000000000 +0200
-+++ zenoss/Products/ZenEvents/zensyslog.py 2007-08-08 19:24:30.000000000 +0200
+--- zenoss~/Products/ZenEvents/zensyslog.py 2007-08-16 15:45:57.000000000 +0200
++++ zenoss/Products/ZenEvents/zensyslog.py 2007-09-07 00:25:41.000000000 +0200
@@ -21,7 +21,7 @@
import time
@@ -31,8 +31,8 @@
from twisted.internet.protocol import DatagramProtocol
from twisted.internet import reactor
diff -urNad zenoss~/Products/ZenHub/zenhub.py zenoss/Products/ZenHub/zenhub.py
---- zenoss~/Products/ZenHub/zenhub.py 2007-08-01 16:36:37.000000000 +0200
-+++ zenoss/Products/ZenHub/zenhub.py 2007-08-08 19:24:30.000000000 +0200
+--- zenoss~/Products/ZenHub/zenhub.py 2007-08-17 14:44:48.000000000 +0200
++++ zenoss/Products/ZenHub/zenhub.py 2007-09-07 00:25:41.000000000 +0200
@@ -22,7 +22,7 @@
__version__ = "$Revision$"[11:-2]
@@ -43,9 +43,9 @@
from twisted.cred import portal, checkers, error, credentials
diff -urNad zenoss~/Products/ZenModel/DataRoot.py zenoss/Products/ZenModel/DataRoot.py
---- zenoss~/Products/ZenModel/DataRoot.py 2007-08-08 19:24:27.000000000 +0200
-+++ zenoss/Products/ZenModel/DataRoot.py 2007-08-08 19:24:30.000000000 +0200
-@@ -458,7 +458,7 @@
+--- zenoss~/Products/ZenModel/DataRoot.py 2007-09-07 00:23:39.000000000 +0200
++++ zenoss/Products/ZenModel/DataRoot.py 2007-09-07 00:25:41.000000000 +0200
+@@ -467,7 +467,7 @@
pack.organization = organization
pack.version = version
self.packs._setObject(id, pack)
@@ -54,7 +54,7 @@
zp = os.path.join(os.environ['ZENHOME'], 'Products', id)
if not os.path.isdir(zp):
os.makedirs(zp, 0750)
-@@ -477,9 +477,9 @@
+@@ -486,9 +486,9 @@
def removeZenPacks(self, ids=(), REQUEST = None):
"""remove a ZenPack"""
@@ -66,9 +66,21 @@
for pack in ids:
os.system('%s run --remove %s' % (zp, pack))
self._p_jar.sync()
+diff -urNad zenoss~/Products/ZenModel/Device.py zenoss/Products/ZenModel/Device.py
+--- zenoss~/Products/ZenModel/Device.py 2007-09-06 18:19:57.000000000 +0200
++++ zenoss/Products/ZenModel/Device.py 2007-09-07 00:25:41.000000000 +0200
+@@ -21,7 +21,7 @@
+
+ __version__ = "$Revision: 1.121 $"[11:-2]
+
+-import os
++import pwd, os
+ import sys
+ import re
+ import time
diff -urNad zenoss~/Products/ZenModel/DeviceClass.py zenoss/Products/ZenModel/DeviceClass.py
---- zenoss~/Products/ZenModel/DeviceClass.py 2007-08-01 22:48:56.000000000 +0200
-+++ zenoss/Products/ZenModel/DeviceClass.py 2007-08-08 19:24:30.000000000 +0200
+--- zenoss~/Products/ZenModel/DeviceClass.py 2007-08-30 04:22:56.000000000 +0200
++++ zenoss/Products/ZenModel/DeviceClass.py 2007-09-07 00:25:41.000000000 +0200
@@ -17,7 +17,7 @@
__version__ = "$Revision: 1.76 $"[11:-2]
@@ -79,8 +91,8 @@
import time
import urllib
diff -urNad zenoss~/Products/ZenModel/IpNetwork.py zenoss/Products/ZenModel/IpNetwork.py
---- zenoss~/Products/ZenModel/IpNetwork.py 2007-06-25 19:45:13.000000000 +0200
-+++ zenoss/Products/ZenModel/IpNetwork.py 2007-08-08 19:24:30.000000000 +0200
+--- zenoss~/Products/ZenModel/IpNetwork.py 2007-08-31 21:33:14.000000000 +0200
++++ zenoss/Products/ZenModel/IpNetwork.py 2007-09-07 00:25:41.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision: 1.22 $"[11:-2]
@@ -90,7 +102,7 @@
import sys
import math
import transaction
-@@ -436,7 +436,7 @@
+@@ -437,7 +437,7 @@
for organizerName in organizerPaths:
try:
organizer = orgroot.getOrganizer(organizerName)
@@ -100,20 +112,20 @@
zendiscCmd = "%s run --net=%s" % (zd, organizer.id)
log.info('Executing command: %s' % zendiscCmd)
diff -urNad zenoss~/Products/ZenModel/PerformanceConf.py zenoss/Products/ZenModel/PerformanceConf.py
---- zenoss~/Products/ZenModel/PerformanceConf.py 2007-06-19 21:13:03.000000000 +0200
-+++ zenoss/Products/ZenModel/PerformanceConf.py 2007-08-08 19:24:30.000000000 +0200
+--- zenoss~/Products/ZenModel/PerformanceConf.py 2007-08-28 13:24:50.000000000 +0200
++++ zenoss/Products/ZenModel/PerformanceConf.py 2007-09-07 00:25:41.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision: 1.30 $"[11:-2]
-import os
+import pwd, os
- import glob
import zlib
import transaction
+ import logging
diff -urNad zenoss~/Products/ZenModel/ZenModelRM.py zenoss/Products/ZenModel/ZenModelRM.py
---- zenoss~/Products/ZenModel/ZenModelRM.py 2007-05-03 17:19:41.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenModelRM.py 2007-08-08 19:24:30.000000000 +0200
+--- zenoss~/Products/ZenModel/ZenModelRM.py 2007-08-15 20:40:59.000000000 +0200
++++ zenoss/Products/ZenModel/ZenModelRM.py 2007-09-07 00:25:41.000000000 +0200
@@ -17,7 +17,7 @@
__version__ = "$Revision: 1.50 $"[11:-2]
@@ -124,8 +136,8 @@
from DateTime import DateTime
diff -urNad zenoss~/Products/ZenModel/ZenPack.py zenoss/Products/ZenModel/ZenPack.py
---- zenoss~/Products/ZenModel/ZenPack.py 2007-07-17 21:11:16.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenPack.py 2007-08-08 19:24:30.000000000 +0200
+--- zenoss~/Products/ZenModel/ZenPack.py 2007-09-05 22:26:28.000000000 +0200
++++ zenoss/Products/ZenModel/ZenPack.py 2007-09-07 00:25:41.000000000 +0200
@@ -24,7 +24,7 @@
import transaction
@@ -136,8 +148,8 @@
__doc__="ZenPacks base definitions"
diff -urNad zenoss~/Products/ZenModel/ZenPackLoader.py zenoss/Products/ZenModel/ZenPackLoader.py
---- zenoss~/Products/ZenModel/ZenPackLoader.py 2007-07-31 20:31:25.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenPackLoader.py 2007-08-08 19:24:30.000000000 +0200
+--- zenoss~/Products/ZenModel/ZenPackLoader.py 2007-08-29 20:26:56.000000000 +0200
++++ zenoss/Products/ZenModel/ZenPackLoader.py 2007-09-07 00:25:41.000000000 +0200
@@ -17,7 +17,7 @@
from Products.ZenReports.ReportLoader import ReportLoader
from Products.ZenUtils.Utils import getObjByPath
@@ -149,7 +161,7 @@
log = logging.getLogger('zen.ZPLoader')
diff -urNad zenoss~/Products/ZenModel/ZenossInfo.py zenoss/Products/ZenModel/ZenossInfo.py
--- zenoss~/Products/ZenModel/ZenossInfo.py 2007-05-18 22:25:16.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenossInfo.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/ZenossInfo.py 2007-09-07 00:25:41.000000000 +0200
@@ -11,7 +11,7 @@
#
###########################################################################
@@ -161,7 +173,7 @@
import logging
diff -urNad zenoss~/Products/ZenModel/migrate/Migrate.py zenoss/Products/ZenModel/migrate/Migrate.py
--- zenoss~/Products/ZenModel/migrate/Migrate.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/Migrate.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/Migrate.py 2007-09-07 00:25:41.000000000 +0200
@@ -41,7 +41,7 @@
def cleanup():
@@ -173,7 +185,7 @@
if f.endswith('.pyc'):
diff -urNad zenoss~/Products/ZenModel/migrate/about_zenoss.py zenoss/Products/ZenModel/migrate/about_zenoss.py
--- zenoss~/Products/ZenModel/migrate/about_zenoss.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/about_zenoss.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/about_zenoss.py 2007-09-07 00:25:41.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision$"[11:-2]
@@ -185,7 +197,7 @@
diff -urNad zenoss~/Products/ZenModel/migrate/betterstandarderrormessage.py zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py
--- zenoss~/Products/ZenModel/migrate/betterstandarderrormessage.py 2007-06-05 15:19:35.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py 2007-09-07 00:25:41.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision$"[11:-2]
@@ -197,7 +209,7 @@
version = Migrate.Version(1, 1, 0)
diff -urNad zenoss~/Products/ZenModel/migrate/command.py zenoss/Products/ZenModel/migrate/command.py
--- zenoss~/Products/ZenModel/migrate/command.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/command.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/command.py 2007-09-07 00:25:41.000000000 +0200
@@ -29,7 +29,7 @@
dmd.Devices._setProperty(name, default, **kw)
@@ -209,7 +221,7 @@
if dmd.Devices.hasProperty("zNagiosCycleTime"):
diff -urNad zenoss~/Products/ZenModel/migrate/datapoints.py zenoss/Products/ZenModel/migrate/datapoints.py
--- zenoss~/Products/ZenModel/migrate/datapoints.py 2007-07-10 17:58:45.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/datapoints.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/datapoints.py 2007-09-07 00:25:41.000000000 +0200
@@ -19,7 +19,7 @@
__version__ = "$Revision$"[11:-2]
@@ -221,7 +233,7 @@
diff -urNad zenoss~/Products/ZenModel/migrate/evenbetterstandarderrormessage.py zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py
--- zenoss~/Products/ZenModel/migrate/evenbetterstandarderrormessage.py 2007-06-05 15:19:35.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py 2007-09-07 00:25:41.000000000 +0200
@@ -11,7 +11,7 @@
'''
@@ -233,7 +245,7 @@
version = Migrate.Version(2, 0, 0)
diff -urNad zenoss~/Products/ZenModel/migrate/hoist_perf_data.py zenoss/Products/ZenModel/migrate/hoist_perf_data.py
--- zenoss~/Products/ZenModel/migrate/hoist_perf_data.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/hoist_perf_data.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/hoist_perf_data.py 2007-09-07 00:25:41.000000000 +0200
@@ -23,7 +23,7 @@
import Migrate
@@ -245,7 +257,7 @@
version = Migrate.Version(0, 21, 0)
diff -urNad zenoss~/Products/ZenModel/migrate/import_export_filesystem.py zenoss/Products/ZenModel/migrate/import_export_filesystem.py
--- zenoss~/Products/ZenModel/migrate/import_export_filesystem.py 2007-07-05 22:09:00.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/import_export_filesystem.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/import_export_filesystem.py 2007-09-07 00:25:41.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision$"[11:-2]
@@ -257,7 +269,7 @@
diff -urNad zenoss~/Products/ZenModel/migrate/kill_cricket.py zenoss/Products/ZenModel/migrate/kill_cricket.py
--- zenoss~/Products/ZenModel/migrate/kill_cricket.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/kill_cricket.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/kill_cricket.py 2007-09-07 00:25:41.000000000 +0200
@@ -21,7 +21,7 @@
__version__ = "$Revision$"[11:-2]
@@ -268,8 +280,8 @@
from Acquisition import aq_base
diff -urNad zenoss~/Products/ZenModel/migrate/menus.py zenoss/Products/ZenModel/migrate/menus.py
---- zenoss~/Products/ZenModel/migrate/menus.py 2007-07-17 15:44:14.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/menus.py 2007-08-08 19:24:30.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/menus.py 2007-09-06 14:21:33.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/menus.py 2007-09-07 00:25:41.000000000 +0200
@@ -19,7 +19,7 @@
$Id:$
'''
@@ -281,7 +293,7 @@
from Products.ZenModel.Device import Device
diff -urNad zenoss~/Products/ZenModel/migrate/processes.py zenoss/Products/ZenModel/migrate/processes.py
--- zenoss~/Products/ZenModel/migrate/processes.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/processes.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/processes.py 2007-09-07 00:25:41.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision$"[11:-2]
@@ -293,7 +305,7 @@
version = Migrate.Version(0, 22, 0)
diff -urNad zenoss~/Products/ZenModel/migrate/procparams.py zenoss/Products/ZenModel/migrate/procparams.py
--- zenoss~/Products/ZenModel/migrate/procparams.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/procparams.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/procparams.py 2007-09-07 00:25:41.000000000 +0200
@@ -21,8 +21,8 @@
version = Migrate.Version(1, 1, 0)
@@ -307,7 +319,7 @@
os.system('cat %s | mysql -u%s -p%s %s' % (
diff -urNad zenoss~/Products/ZenModel/migrate/rrdmin.py zenoss/Products/ZenModel/migrate/rrdmin.py
--- zenoss~/Products/ZenModel/migrate/rrdmin.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/rrdmin.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/rrdmin.py 2007-09-07 00:25:41.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision$"[11:-2]
@@ -319,7 +331,7 @@
try:
diff -urNad zenoss~/Products/ZenModel/migrate/smtpsnpp.py zenoss/Products/ZenModel/migrate/smtpsnpp.py
--- zenoss~/Products/ZenModel/migrate/smtpsnpp.py 2007-06-05 15:19:35.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/smtpsnpp.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/smtpsnpp.py 2007-09-07 00:25:41.000000000 +0200
@@ -17,7 +17,7 @@
'''
@@ -331,7 +343,7 @@
"""parse a config file which has key value pairs delimited by white space"""
diff -urNad zenoss~/Products/ZenModel/migrate/standalone_datapoint_rename.py zenoss/Products/ZenModel/migrate/standalone_datapoint_rename.py
--- zenoss~/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-06-05 15:19:35.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-09-07 00:25:41.000000000 +0200
@@ -11,7 +11,7 @@
#
###########################################################################
@@ -343,7 +355,7 @@
fullpath = os.path.join(d, f)
diff -urNad zenoss~/Products/ZenModel/migrate/standarderrormessage.py zenoss/Products/ZenModel/migrate/standarderrormessage.py
--- zenoss~/Products/ZenModel/migrate/standarderrormessage.py 2007-06-05 15:19:35.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/standarderrormessage.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/standarderrormessage.py 2007-09-07 00:25:41.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision$"[11:-2]
@@ -355,7 +367,7 @@
version = Migrate.Version(0, 23, 0)
diff -urNad zenoss~/Products/ZenModel/migrate/twopointohobjects.py zenoss/Products/ZenModel/migrate/twopointohobjects.py
--- zenoss~/Products/ZenModel/migrate/twopointohobjects.py 2007-07-12 23:51:44.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/twopointohobjects.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/twopointohobjects.py 2007-09-07 00:25:41.000000000 +0200
@@ -25,7 +25,7 @@
dmd.Devices.manage_addRRDTemplate('softwareLoopback')
@@ -367,7 +379,7 @@
def _cleanupClass(self, dmd):
diff -urNad zenoss~/Products/ZenModel/zenbuild.py zenoss/Products/ZenModel/zenbuild.py
--- zenoss~/Products/ZenModel/zenbuild.py 2007-05-21 16:06:32.000000000 +0200
-+++ zenoss/Products/ZenModel/zenbuild.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/zenbuild.py 2007-09-07 00:25:41.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision: 1.11 $"[11:-2]
@@ -379,7 +391,7 @@
import transaction
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-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/zendmd.py 2007-09-07 00:25:41.000000000 +0200
@@ -11,7 +11,7 @@
#
###########################################################################
@@ -391,7 +403,7 @@
try:
diff -urNad zenoss~/Products/ZenModel/zenmib.py zenoss/Products/ZenModel/zenmib.py
--- zenoss~/Products/ZenModel/zenmib.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/zenmib.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenModel/zenmib.py 2007-09-07 00:25:41.000000000 +0200
@@ -11,7 +11,7 @@
#
###########################################################################
@@ -402,8 +414,8 @@
from sets import Set
import pprint
diff -urNad zenoss~/Products/ZenRRD/RenderServer.py zenoss/Products/ZenRRD/RenderServer.py
---- zenoss~/Products/ZenRRD/RenderServer.py 2007-08-01 22:04:12.000000000 +0200
-+++ zenoss/Products/ZenRRD/RenderServer.py 2007-08-08 19:24:30.000000000 +0200
+--- zenoss~/Products/ZenRRD/RenderServer.py 2007-09-06 02:45:32.000000000 +0200
++++ zenoss/Products/ZenRRD/RenderServer.py 2007-09-07 00:25:41.000000000 +0200
@@ -19,7 +19,7 @@
__version__ = "$Revision: 1.14 $"[11:-2]
@@ -415,7 +427,7 @@
import urllib
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateCpu.py zenoss/Products/ZenRRD/plugins/aggregateCpu.py
--- zenoss~/Products/ZenRRD/plugins/aggregateCpu.py 2007-06-05 15:19:35.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateCpu.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateCpu.py 2007-09-07 00:25:41.000000000 +0200
@@ -11,7 +11,7 @@
#
###########################################################################
@@ -427,7 +439,7 @@
import random
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateFreeMemory.py zenoss/Products/ZenRRD/plugins/aggregateFreeMemory.py
--- zenoss~/Products/ZenRRD/plugins/aggregateFreeMemory.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateFreeMemory.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateFreeMemory.py 2007-09-07 00:25:41.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#
@@ -439,7 +451,7 @@
import rrdtool
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateIdle.py zenoss/Products/ZenRRD/plugins/aggregateIdle.py
--- zenoss~/Products/ZenRRD/plugins/aggregateIdle.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateIdle.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateIdle.py 2007-09-07 00:25:41.000000000 +0200
@@ -11,7 +11,7 @@
#
###########################################################################
@@ -451,7 +463,7 @@
import rrdtool
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateNetwork.py zenoss/Products/ZenRRD/plugins/aggregateNetwork.py
--- zenoss~/Products/ZenRRD/plugins/aggregateNetwork.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateNetwork.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateNetwork.py 2007-09-07 00:25:41.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#
@@ -463,7 +475,7 @@
import rrdtool
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateSwap.py zenoss/Products/ZenRRD/plugins/aggregateSwap.py
--- zenoss~/Products/ZenRRD/plugins/aggregateSwap.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateSwap.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateSwap.py 2007-09-07 00:25:41.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#
@@ -475,7 +487,7 @@
import rrdtool
diff -urNad zenoss~/Products/ZenRRD/plugins/areaLine.py zenoss/Products/ZenRRD/plugins/areaLine.py
--- zenoss~/Products/ZenRRD/plugins/areaLine.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/areaLine.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/areaLine.py 2007-09-07 00:25:41.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#
@@ -487,7 +499,7 @@
import rrdtool
diff -urNad zenoss~/Products/ZenRRD/plugins/plugin.py zenoss/Products/ZenRRD/plugins/plugin.py
--- zenoss~/Products/ZenRRD/plugins/plugin.py 2007-07-05 22:09:00.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/plugin.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/plugin.py 2007-09-07 00:25:41.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#
@@ -499,7 +511,7 @@
TMPDIR='/tmp/renderserver'
diff -urNad zenoss~/Products/ZenRRD/plugins/randomExample.py zenoss/Products/ZenRRD/plugins/randomExample.py
--- zenoss~/Products/ZenRRD/plugins/randomExample.py 2007-04-25 21:01:19.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/randomExample.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/randomExample.py 2007-09-07 00:25:41.000000000 +0200
@@ -13,7 +13,7 @@
# It probably isn't a great example to follow style-wise.
@@ -511,7 +523,7 @@
import rrdtool
diff -urNad zenoss~/Products/ZenRRD/plugins/upperLower.py zenoss/Products/ZenRRD/plugins/upperLower.py
--- zenoss~/Products/ZenRRD/plugins/upperLower.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/upperLower.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/upperLower.py 2007-09-07 00:25:41.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#
@@ -523,7 +535,7 @@
import rrdtool
diff -urNad zenoss~/Products/ZenRRD/zentestcommand.py zenoss/Products/ZenRRD/zentestcommand.py
--- zenoss~/Products/ZenRRD/zentestcommand.py 2007-07-16 23:03:45.000000000 +0200
-+++ zenoss/Products/ZenRRD/zentestcommand.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenRRD/zentestcommand.py 2007-09-07 00:25:41.000000000 +0200
@@ -19,7 +19,7 @@
__version__ = "$Revision$"[11:-2]
@@ -535,7 +547,7 @@
import time
diff -urNad zenoss~/Products/ZenReports/ReportServer.py zenoss/Products/ZenReports/ReportServer.py
--- zenoss~/Products/ZenReports/ReportServer.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenReports/ReportServer.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenReports/ReportServer.py 2007-09-07 00:25:41.000000000 +0200
@@ -25,7 +25,7 @@
from Products.ZenModel.ZenModelRM import ZenModelRM
from Products.ZenUtils.Utils import importClass
@@ -547,7 +559,7 @@
class ReportServer(ZenModelRM):
diff -urNad zenoss~/Products/ZenUtils/ConfDaemon.py zenoss/Products/ZenUtils/ConfDaemon.py
--- zenoss~/Products/ZenUtils/ConfDaemon.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenUtils/ConfDaemon.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenUtils/ConfDaemon.py 2007-09-07 00:25:41.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision: 1.9 $"[11:-2]
@@ -559,7 +571,7 @@
import time
diff -urNad zenoss~/Products/ZenUtils/Graphics.py zenoss/Products/ZenUtils/Graphics.py
--- zenoss~/Products/ZenUtils/Graphics.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenUtils/Graphics.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenUtils/Graphics.py 2007-09-07 00:25:41.000000000 +0200
@@ -58,7 +58,7 @@
@@ -571,7 +583,7 @@
os.system("$ZENHOME/bin/dot -c")
diff -urNad zenoss~/Products/ZenUtils/ZCmdBase.py zenoss/Products/ZenUtils/ZCmdBase.py
--- zenoss~/Products/ZenUtils/ZCmdBase.py 2007-06-15 16:54:49.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZCmdBase.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenUtils/ZCmdBase.py 2007-09-07 00:25:41.000000000 +0200
@@ -26,7 +26,7 @@
from Exceptions import ZentinelException
from ZenDaemon import ZenDaemon
@@ -583,7 +595,7 @@
defaultCacheDir = os.path.join(defaultCacheDir, 'var')
diff -urNad zenoss~/Products/ZenUtils/ZenBackup.py zenoss/Products/ZenUtils/ZenBackup.py
--- zenoss~/Products/ZenUtils/ZenBackup.py 2007-07-05 22:09:00.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenBackup.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenBackup.py 2007-09-07 00:25:41.000000000 +0200
@@ -21,8 +21,8 @@
import Globals
from ZCmdBase import ZCmdBase
@@ -597,7 +609,7 @@
import ConfigParser
diff -urNad zenoss~/Products/ZenUtils/ZenBackupBase.py zenoss/Products/ZenUtils/ZenBackupBase.py
--- zenoss~/Products/ZenUtils/ZenBackupBase.py 2007-06-04 21:32:10.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenBackupBase.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenBackupBase.py 2007-09-07 00:25:41.000000000 +0200
@@ -18,8 +18,8 @@
Common code for zenbackup.py and zenrestore.py
'''
@@ -611,7 +623,7 @@
diff -urNad zenoss~/Products/ZenUtils/ZenDaemon.py zenoss/Products/ZenUtils/ZenDaemon.py
--- zenoss~/Products/ZenUtils/ZenDaemon.py 2007-07-10 21:53:24.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenDaemon.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenDaemon.py 2007-09-07 00:25:41.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision: 1.9 $"[11:-2]
@@ -623,7 +635,7 @@
import logging
diff -urNad zenoss~/Products/ZenUtils/ZenScriptBase.py zenoss/Products/ZenUtils/ZenScriptBase.py
--- zenoss~/Products/ZenUtils/ZenScriptBase.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenScriptBase.py 2007-08-08 19:24:30.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenScriptBase.py 2007-09-07 00:25:41.000000000 +0200
@@ -22,7 +22,7 @@
from Exceptions import ZentinelException
@@ -635,13 +647,15 @@
defaultCacheDir = os.path.join(defaultCacheDir, 'var')
diff -urNad zenoss~/Products/ZenUtils/zenpack.py zenoss/Products/ZenUtils/zenpack.py
--- zenoss~/Products/ZenUtils/zenpack.py 2007-07-31 20:31:25.000000000 +0200
-+++ zenoss/Products/ZenUtils/zenpack.py 2007-08-08 19:25:04.000000000 +0200
-@@ -21,7 +21,7 @@
++++ zenoss/Products/ZenUtils/zenpack.py 2007-09-07 00:25:41.000000000 +0200
+@@ -21,8 +21,8 @@
from StringIO import StringIO
import ConfigParser
from Products.ZenModel.ZenPackLoader import CONFIG_FILE, CONFIG_SECTION_ABOUT
-import os, sys
+-import os.path
+import pwd, os, sys
- import os.path
++import pwd, os.path
class ZenPackCmd(ZenScriptBase):
+ "Manage ZenPacks"
Modified: trunk/packages/zenoss/debian/patches/ZENHOME30-os.environ.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME30-os.environ.dpatch?rev=289&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME30-os.environ.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME30-os.environ.dpatch Thu Sep 6 22:33:55 2007
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad zenoss~/Products/ZenEvents/zensendsyslog.py zenoss/Products/ZenEvents/zensendsyslog.py
---- zenoss~/Products/ZenEvents/zensendsyslog.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenEvents/zensendsyslog.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenEvents/zensendsyslog.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenEvents/zensendsyslog.py 2007-09-07 00:26:32.000000000 +0200
@@ -15,7 +15,7 @@
import socket
import time
@@ -18,8 +18,8 @@
defaultInfile = os.path.join(logdir, "origsyslog.log")
diff -urNad zenoss~/Products/ZenEvents/zensyslog.py zenoss/Products/ZenEvents/zensyslog.py
---- zenoss~/Products/ZenEvents/zensyslog.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenEvents/zensyslog.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenEvents/zensyslog.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenEvents/zensyslog.py 2007-09-07 00:26:32.000000000 +0200
@@ -57,7 +57,7 @@
self.olog = logging.getLogger("origsyslog")
self.olog.setLevel(20)
@@ -30,21 +30,21 @@
hdlr.setFormatter(logging.Formatter("%(message)s"))
self.olog.addHandler(hdlr)
diff -urNad zenoss~/Products/ZenHub/zenhub.py zenoss/Products/ZenHub/zenhub.py
---- zenoss~/Products/ZenHub/zenhub.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenHub/zenhub.py 2007-07-09 13:15:34.000000000 +0200
-@@ -276,7 +276,7 @@
- self.parser.add_option('--passwd',
+--- zenoss~/Products/ZenHub/zenhub.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenHub/zenhub.py 2007-09-07 00:27:27.000000000 +0200
+@@ -282,7 +282,7 @@
dest='passwordfile',
type='string',
+ help='File where passwords are stored',
- default=os.path.join(os.environ['ZENHOME'],
+ default=os.path.join(pwd.getpwnam('zenoss')[5],
'etc','hubpasswd'))
diff -urNad zenoss~/Products/ZenModel/DataRoot.py zenoss/Products/ZenModel/DataRoot.py
---- zenoss~/Products/ZenModel/DataRoot.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenModel/DataRoot.py 2007-07-09 13:15:34.000000000 +0200
-@@ -465,7 +465,7 @@
+--- zenoss~/Products/ZenModel/DataRoot.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/DataRoot.py 2007-09-07 00:26:32.000000000 +0200
+@@ -468,7 +468,7 @@
pack.version = version
self.packs._setObject(id, pack)
import pwd, os
@@ -53,7 +53,7 @@
if not os.path.isdir(zp):
os.makedirs(zp, 0750)
for d in ['objects', 'skins', 'modeler/plugins',
-@@ -484,7 +484,7 @@
+@@ -487,7 +487,7 @@
def removeZenPacks(self, ids=(), REQUEST = None):
"""remove a ZenPack"""
import pwd, os
@@ -62,10 +62,22 @@
import pwd, os
for pack in ids:
os.system('%s run --remove %s' % (zp, pack))
+diff -urNad zenoss~/Products/ZenModel/Device.py zenoss/Products/ZenModel/Device.py
+--- zenoss~/Products/ZenModel/Device.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/Device.py 2007-09-07 00:28:16.000000000 +0200
+@@ -1262,7 +1262,7 @@
+ handler = setWebLoggingStream(response)
+
+ try:
+- zm = os.path.join(os.environ['ZENHOME'], 'bin', 'zenmodeler')
++ zm = os.path.join(pwd.getpwnam('zenoss')[5], 'bin', 'zenmodeler')
+ zenmodelerCmd = '%s run --now -F -d %s' % (zm, self.id)
+ log.info('Executing command: %s' % zenmodelerCmd)
+ f = Popen4(zenmodelerCmd)
diff -urNad zenoss~/Products/ZenModel/IpNetwork.py zenoss/Products/ZenModel/IpNetwork.py
---- zenoss~/Products/ZenModel/IpNetwork.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenModel/IpNetwork.py 2007-07-09 13:15:34.000000000 +0200
-@@ -437,7 +437,7 @@
+--- zenoss~/Products/ZenModel/IpNetwork.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/IpNetwork.py 2007-09-07 00:26:32.000000000 +0200
+@@ -438,7 +438,7 @@
try:
organizer = orgroot.getOrganizer(organizerName)
import pwd, os
@@ -75,33 +87,33 @@
log.info('Executing command: %s' % zendiscCmd)
f = Popen4(zendiscCmd)
diff -urNad zenoss~/Products/ZenModel/PerformanceConf.py zenoss/Products/ZenModel/PerformanceConf.py
---- zenoss~/Products/ZenModel/PerformanceConf.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenModel/PerformanceConf.py 2007-07-09 13:15:34.000000000 +0200
-@@ -63,7 +63,7 @@
-
- from ZenDate import ZenDate
-
--PERF_ROOT = os.path.join(os.environ['ZENHOME'], "perf")
-+PERF_ROOT = os.path.join(pwd.getpwnam('zenoss')[5], "perf")
-
+--- zenoss~/Products/ZenModel/PerformanceConf.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/PerformanceConf.py 2007-09-07 00:28:16.000000000 +0200
+@@ -64,7 +64,7 @@
def performancePath(target):
+ global PERF_ROOT
+ if PERF_ROOT is None:
+- PERF_ROOT = os.path.join(os.environ['ZENHOME'], "perf")
++ PERF_ROOT = os.path.join(pwd.getpwnam('zenoss')[5], "perf")
if target.startswith("/"): target = target[1:]
+ return os.path.join(PERF_ROOT, target)
+
diff -urNad zenoss~/Products/ZenModel/ZenPack.py zenoss/Products/ZenModel/ZenPack.py
---- zenoss~/Products/ZenModel/ZenPack.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenPack.py 2007-07-09 13:15:34.000000000 +0200
-@@ -165,7 +165,7 @@
- from Products.ZenModel.ZenPackLoader import *
+--- zenoss~/Products/ZenModel/ZenPack.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/ZenPack.py 2007-09-07 00:28:16.000000000 +0200
+@@ -290,7 +290,7 @@
+
def zenPackPath(*parts):
- return os.path.join(os.environ['ZENHOME'], 'Products', *parts)
+ return os.path.join(pwd.getpwnam('zenoss')[5], 'Products', *parts)
- class ZenPackBase(ZenPack):
-
+
+ # ZenPackBase is here for backwards compatibility with older installed
diff -urNad zenoss~/Products/ZenModel/ZenPackLoader.py zenoss/Products/ZenModel/ZenPackLoader.py
---- zenoss~/Products/ZenModel/ZenPackLoader.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenPackLoader.py 2007-07-09 13:15:34.000000000 +0200
-@@ -155,7 +155,7 @@
+--- zenoss~/Products/ZenModel/ZenPackLoader.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/ZenPackLoader.py 2007-09-07 00:26:32.000000000 +0200
+@@ -164,7 +164,7 @@
def binPath(self, daemon):
@@ -111,8 +123,8 @@
os.path.basename(daemon))
diff -urNad zenoss~/Products/ZenModel/migrate/Migrate.py zenoss/Products/ZenModel/migrate/Migrate.py
---- zenoss~/Products/ZenModel/migrate/Migrate.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/Migrate.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/Migrate.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/Migrate.py 2007-09-07 00:26:32.000000000 +0200
@@ -42,7 +42,7 @@
def cleanup():
"recursively remove all files ending with .pyc"
@@ -123,8 +135,8 @@
if f.endswith('.pyc'):
fullPath = os.path.join(p, f)
diff -urNad zenoss~/Products/ZenModel/migrate/command.py zenoss/Products/ZenModel/migrate/command.py
---- zenoss~/Products/ZenModel/migrate/command.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/command.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/command.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/command.py 2007-09-07 00:26:32.000000000 +0200
@@ -31,7 +31,7 @@
def cutover(self, dmd):
import pwd, os
@@ -135,8 +147,8 @@
dmd.Devices._delProperty("zNagiosCycleTime")
zem = self.dmd.ZenEventManager
diff -urNad zenoss~/Products/ZenModel/migrate/kill_cricket.py zenoss/Products/ZenModel/migrate/kill_cricket.py
---- zenoss~/Products/ZenModel/migrate/kill_cricket.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/kill_cricket.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/kill_cricket.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/kill_cricket.py 2007-09-07 00:26:32.000000000 +0200
@@ -93,7 +93,7 @@
from Products.ZenRelations.ImportRM import ImportRM
imp = ImportRM(noopts=True, app=dmd.getPhysicalRoot())
@@ -147,8 +159,8 @@
imp.loadDatabase()
diff -urNad zenoss~/Products/ZenModel/migrate/menus.py zenoss/Products/ZenModel/migrate/menus.py
---- zenoss~/Products/ZenModel/migrate/menus.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/menus.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/menus.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/menus.py 2007-09-07 00:26:32.000000000 +0200
@@ -24,7 +24,7 @@
from Products.ZenModel.DeviceClass import DeviceClass
from Products.ZenModel.Device import Device
@@ -159,8 +171,8 @@
ZenPackItems = dict(
diff -urNad zenoss~/Products/ZenModel/migrate/processes.py zenoss/Products/ZenModel/migrate/processes.py
---- zenoss~/Products/ZenModel/migrate/processes.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/processes.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/processes.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/processes.py 2007-09-07 00:26:32.000000000 +0200
@@ -41,7 +41,7 @@
imp = ImportRM(noopts=True, app=dmd.getPhysicalRoot())
imp.options.noCommit = True
@@ -171,8 +183,8 @@
imp.loadDatabase()
diff -urNad zenoss~/Products/ZenModel/migrate/procparams.py zenoss/Products/ZenModel/migrate/procparams.py
---- zenoss~/Products/ZenModel/migrate/procparams.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/procparams.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/procparams.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/procparams.py 2007-09-07 00:26:32.000000000 +0200
@@ -24,7 +24,7 @@
import pwd, os
import pwd, os.path
@@ -183,8 +195,8 @@
procs,
dmd.ZenEventManager.username,
diff -urNad zenoss~/Products/ZenModel/migrate/rrdmin.py zenoss/Products/ZenModel/migrate/rrdmin.py
---- zenoss~/Products/ZenModel/migrate/rrdmin.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/rrdmin.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/rrdmin.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/rrdmin.py 2007-09-07 00:26:32.000000000 +0200
@@ -36,7 +36,7 @@
version = Migrate.Version(0, 22, 0)
@@ -195,8 +207,8 @@
rrdtool.tune(os.path.join(d, f), '-i', 'ds0:' + value)
diff -urNad zenoss~/Products/ZenModel/migrate/smtpsnpp.py zenoss/Products/ZenModel/migrate/smtpsnpp.py
---- zenoss~/Products/ZenModel/migrate/smtpsnpp.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/smtpsnpp.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/smtpsnpp.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/smtpsnpp.py 2007-09-07 00:26:32.000000000 +0200
@@ -46,7 +46,7 @@
def cutover(self, dmd):
options = OptionsBucket()
@@ -207,8 +219,8 @@
if not hasattr(dmd, 'smtpHost'):
dmd.smtpHost = getattr(options, 'smtphost', '') or 'localhost'
diff -urNad zenoss~/Products/ZenModel/migrate/standalone_datapoint_rename.py zenoss/Products/ZenModel/migrate/standalone_datapoint_rename.py
---- zenoss~/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-09-07 00:26:32.000000000 +0200
@@ -12,7 +12,7 @@
###########################################################################
#!/usr/bin/python
@@ -219,8 +231,8 @@
fullpath = os.path.join(d, f)
if f.find('_') >= 0: continue
diff -urNad zenoss~/Products/ZenModel/migrate/twopointohobjects.py zenoss/Products/ZenModel/migrate/twopointohobjects.py
---- zenoss~/Products/ZenModel/migrate/twopointohobjects.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/twopointohobjects.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/twopointohobjects.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/twopointohobjects.py 2007-09-07 00:26:32.000000000 +0200
@@ -26,7 +26,7 @@
def _zCommandPath(self, dmd):
@@ -231,8 +243,8 @@
def _cleanupClass(self, dmd):
d = [d.id for d in dmd.Devices.Server.Linux.getSubDevices()]
diff -urNad zenoss~/Products/ZenModel/zenbuild.py zenoss/Products/ZenModel/zenbuild.py
---- zenoss~/Products/ZenModel/zenbuild.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenModel/zenbuild.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenModel/zenbuild.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/zenbuild.py 2007-09-07 00:28:16.000000000 +0200
@@ -29,7 +29,7 @@
print "ERROR: ZENHOME envrionment variable not set"
sys.exit(1)
@@ -252,8 +264,8 @@
Zope2.configure(zopeconf)
self.app = Zope2.app()
diff -urNad zenoss~/Products/ZenModel/zenmib.py zenoss/Products/ZenModel/zenmib.py
---- zenoss~/Products/ZenModel/zenmib.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenModel/zenmib.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenModel/zenmib.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenModel/zenmib.py 2007-09-07 00:26:32.000000000 +0200
@@ -137,7 +137,7 @@
def load(self):
@@ -264,9 +276,9 @@
map(lambda x: os.path.join(smimibdir, x),
'ietf iana irtf tubs site'.split())
diff -urNad zenoss~/Products/ZenRRD/RenderServer.py zenoss/Products/ZenRRD/RenderServer.py
---- zenoss~/Products/ZenRRD/RenderServer.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenRRD/RenderServer.py 2007-07-09 13:15:34.000000000 +0200
-@@ -210,7 +210,7 @@
+--- zenoss~/Products/ZenRRD/RenderServer.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenRRD/RenderServer.py 2007-09-07 00:26:32.000000000 +0200
+@@ -217,7 +217,7 @@
"render a custom graph and return it"
try:
dmd = self.dmd
@@ -276,8 +288,8 @@
exec open(m)
return graph
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateCpu.py zenoss/Products/ZenRRD/plugins/aggregateCpu.py
---- zenoss~/Products/ZenRRD/plugins/aggregateCpu.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateCpu.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenRRD/plugins/aggregateCpu.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateCpu.py 2007-09-07 00:26:32.000000000 +0200
@@ -39,7 +39,7 @@
fname = "%s/graph-%s.png" % (TMPDIR,name)
cmd = [fname,] + basicArgs(env) + args
@@ -288,8 +300,8 @@
rfiles = []
devicePat = re.compile('.*(' + devices + ').*')
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateFreeMemory.py zenoss/Products/ZenRRD/plugins/aggregateFreeMemory.py
---- zenoss~/Products/ZenRRD/plugins/aggregateFreeMemory.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateFreeMemory.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenRRD/plugins/aggregateFreeMemory.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateFreeMemory.py 2007-09-07 00:26:32.000000000 +0200
@@ -45,7 +45,7 @@
'--vertical-label=%(label)s' % env] + args
ifiles = []
@@ -300,8 +312,8 @@
devicePat = re.compile('.*(' + env.get('devices', '') + ').*')
for d, _, fs in os.walk(perf):
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateIdle.py zenoss/Products/ZenRRD/plugins/aggregateIdle.py
---- zenoss~/Products/ZenRRD/plugins/aggregateIdle.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateIdle.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenRRD/plugins/aggregateIdle.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateIdle.py 2007-09-07 00:26:32.000000000 +0200
@@ -46,7 +46,7 @@
'--lower-limit=0',
'--vertical-label=%(label)s' % env] + args
@@ -312,8 +324,8 @@
rfiles = []
for d, _, fs in os.walk(perf):
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateNetwork.py zenoss/Products/ZenRRD/plugins/aggregateNetwork.py
---- zenoss~/Products/ZenRRD/plugins/aggregateNetwork.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateNetwork.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenRRD/plugins/aggregateNetwork.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateNetwork.py 2007-09-07 00:26:32.000000000 +0200
@@ -38,7 +38,7 @@
'--vertical-label=%(label)s' % env]
ifiles = []
@@ -324,8 +336,8 @@
for d, _, fs in os.walk(perf):
for f in fs:
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateSwap.py zenoss/Products/ZenRRD/plugins/aggregateSwap.py
---- zenoss~/Products/ZenRRD/plugins/aggregateSwap.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateSwap.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenRRD/plugins/aggregateSwap.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateSwap.py 2007-09-07 00:26:32.000000000 +0200
@@ -44,7 +44,7 @@
'--vertical-label=%(label)s' % env] + args
ifiles = []
@@ -336,8 +348,8 @@
devicePat = re.compile('.*(' + env.get('devices', '') + ').*')
for d, _, fs in os.walk(perf):
diff -urNad zenoss~/Products/ZenRRD/plugins/areaLine.py zenoss/Products/ZenRRD/plugins/areaLine.py
---- zenoss~/Products/ZenRRD/plugins/areaLine.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/areaLine.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenRRD/plugins/areaLine.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/areaLine.py 2007-09-07 00:26:32.000000000 +0200
@@ -42,7 +42,7 @@
fname = "%s/graph-%s.png" % (TMPDIR,name)
afiles = []
@@ -348,8 +360,8 @@
for d, _, fs in os.walk(perf):
if not devPat.match(d): continue
diff -urNad zenoss~/Products/ZenRRD/plugins/plugin.py zenoss/Products/ZenRRD/plugins/plugin.py
---- zenoss~/Products/ZenRRD/plugins/plugin.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/plugin.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenRRD/plugins/plugin.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/plugin.py 2007-09-07 00:26:32.000000000 +0200
@@ -50,7 +50,7 @@
except OSError:
return None
@@ -360,8 +372,8 @@
title = 'Plugin Title'
label = ''
diff -urNad zenoss~/Products/ZenRRD/plugins/upperLower.py zenoss/Products/ZenRRD/plugins/upperLower.py
---- zenoss~/Products/ZenRRD/plugins/upperLower.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/upperLower.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenRRD/plugins/upperLower.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/upperLower.py 2007-09-07 00:26:32.000000000 +0200
@@ -42,7 +42,7 @@
fname = "%s/graph-%s.png" % (TMPDIR,name)
lfiles = []
@@ -373,7 +385,7 @@
if not devPat.match(d): continue
diff -urNad zenoss~/Products/ZenRelations/schemadoc.py zenoss/Products/ZenRelations/schemadoc.py
--- zenoss~/Products/ZenRelations/schemadoc.py 2007-07-05 22:09:00.000000000 +0200
-+++ zenoss/Products/ZenRelations/schemadoc.py 2007-07-09 13:15:34.000000000 +0200
++++ zenoss/Products/ZenRelations/schemadoc.py 2007-09-07 00:26:32.000000000 +0200
@@ -142,7 +142,7 @@
baseModule = None
if len(sys.argv) > 1:
@@ -384,8 +396,8 @@
skipnames=("ZentinelPortal", "ZDeviceLoader"))
htmlGen = HtmlGenerator(baseModule, classList, docdir)
diff -urNad zenoss~/Products/ZenReports/ReportServer.py zenoss/Products/ZenReports/ReportServer.py
---- zenoss~/Products/ZenReports/ReportServer.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenReports/ReportServer.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenReports/ReportServer.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenReports/ReportServer.py 2007-09-07 00:26:32.000000000 +0200
@@ -37,7 +37,7 @@
"Run a plugin to generate the report object"
dmd = self.dmd
@@ -396,8 +408,8 @@
directories = [
p.path('reports', 'plugins') for p in self.packs()
diff -urNad zenoss~/Products/ZenUtils/ConfDaemon.py zenoss/Products/ZenUtils/ConfDaemon.py
---- zenoss~/Products/ZenUtils/ConfDaemon.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenUtils/ConfDaemon.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenUtils/ConfDaemon.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenUtils/ConfDaemon.py 2007-09-07 00:26:32.000000000 +0200
@@ -60,7 +60,7 @@
print >>sys.stderr, ("fork #2 failed: %d (%s)" %
(e.errno, e.strerror))
@@ -408,8 +420,8 @@
if os.path.exists(zenhome):
file = open(pidfile, 'w')
diff -urNad zenoss~/Products/ZenUtils/Graphics.py zenoss/Products/ZenUtils/Graphics.py
---- zenoss~/Products/ZenUtils/Graphics.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenUtils/Graphics.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenUtils/Graphics.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenUtils/Graphics.py 2007-09-07 00:28:16.000000000 +0200
@@ -59,7 +59,7 @@
def setGraphFromEdges(self, edges, directed=True):
@@ -420,8 +432,8 @@
os.system("$ZENHOME/bin/dot -c")
import pydot
diff -urNad zenoss~/Products/ZenUtils/ZenDaemon.py zenoss/Products/ZenUtils/ZenDaemon.py
---- zenoss~/Products/ZenUtils/ZenDaemon.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenDaemon.py 2007-07-09 13:15:34.000000000 +0200
+--- zenoss~/Products/ZenUtils/ZenDaemon.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenDaemon.py 2007-09-07 00:26:32.000000000 +0200
@@ -50,7 +50,7 @@
def __init__(self, noopts=0, keeproot=False):
CmdBase.__init__(self, noopts)
@@ -441,10 +453,10 @@
h = logging.FileHandler(logfile)
h.setFormatter(logging.Formatter(
diff -urNad zenoss~/Products/ZenUtils/zenpack.py zenoss/Products/ZenUtils/zenpack.py
---- zenoss~/Products/ZenUtils/zenpack.py 2007-07-09 13:09:51.000000000 +0200
-+++ zenoss/Products/ZenUtils/zenpack.py 2007-07-09 13:15:34.000000000 +0200
-@@ -117,7 +117,7 @@
- self.stop("%s already exists" % root)
+--- zenoss~/Products/ZenUtils/zenpack.py 2007-09-07 00:26:31.000000000 +0200
++++ zenoss/Products/ZenUtils/zenpack.py 2007-09-07 00:28:16.000000000 +0200
+@@ -166,7 +166,7 @@
+ root = zenPackPath(packName)
self.log.debug('Extracting ZenPack "%s"' % packName)
for name in zf.namelist():
- fullname = os.path.join(os.environ['ZENHOME'], 'Products', name)
Modified: trunk/packages/zenoss/debian/patches/ZENHOME40-os.getent.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME40-os.getent.dpatch?rev=289&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME40-os.getent.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME40-os.getent.dpatch Thu Sep 6 22:33:55 2007
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad zenoss~/Products/ZenModel/DeviceClass.py zenoss/Products/ZenModel/DeviceClass.py
---- zenoss~/Products/ZenModel/DeviceClass.py 2007-07-22 10:39:26.000000000 +0200
-+++ zenoss/Products/ZenModel/DeviceClass.py 2007-07-22 10:40:00.000000000 +0200
-@@ -423,7 +423,7 @@
+--- zenoss~/Products/ZenModel/DeviceClass.py 2007-09-07 00:29:21.000000000 +0200
++++ zenoss/Products/ZenModel/DeviceClass.py 2007-09-07 00:29:31.000000000 +0200
+@@ -483,7 +483,7 @@
"""Get a list of XML filenames and basenames from the ZENHOME/import
directory.
"""
@@ -18,8 +18,8 @@
for filename in glob(path+os.path.sep+'*.xml'):
basename = os.path.basename(filename)
diff -urNad zenoss~/Products/ZenModel/ZenModelRM.py zenoss/Products/ZenModel/ZenModelRM.py
---- zenoss~/Products/ZenModel/ZenModelRM.py 2007-07-22 10:39:26.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenModelRM.py 2007-07-22 10:39:29.000000000 +0200
+--- zenoss~/Products/ZenModel/ZenModelRM.py 2007-09-07 00:29:21.000000000 +0200
++++ zenoss/Products/ZenModel/ZenModelRM.py 2007-09-07 00:29:22.000000000 +0200
@@ -107,7 +107,7 @@
dest = 'filesystem'
if REQUEST:
@@ -30,9 +30,9 @@
fileBase = '%s_%s.xml' % (context.getNodeName(), context.id)
if dest == 'filesystem':
diff -urNad zenoss~/Products/ZenModel/ZenPack.py zenoss/Products/ZenModel/ZenPack.py
---- zenoss~/Products/ZenModel/ZenPack.py 2007-07-22 10:39:26.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenPack.py 2007-07-22 10:39:55.000000000 +0200
-@@ -249,7 +249,7 @@
+--- zenoss~/Products/ZenModel/ZenPack.py 2007-09-07 00:29:21.000000000 +0200
++++ zenoss/Products/ZenModel/ZenPack.py 2007-09-07 00:29:22.000000000 +0200
+@@ -250,7 +250,7 @@
fp.close()
# Create the zip file
@@ -42,8 +42,8 @@
if not os.path.isdir(path):
os.makeDirs(path, 0750)
diff -urNad zenoss~/Products/ZenModel/ZenossInfo.py zenoss/Products/ZenModel/ZenossInfo.py
---- zenoss~/Products/ZenModel/ZenossInfo.py 2007-07-22 10:39:26.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenossInfo.py 2007-07-22 10:39:29.000000000 +0200
+--- zenoss~/Products/ZenModel/ZenossInfo.py 2007-09-07 00:29:21.000000000 +0200
++++ zenoss/Products/ZenModel/ZenossInfo.py 2007-09-07 00:29:22.000000000 +0200
@@ -179,7 +179,7 @@
v = Version(*getRRDToolVersion())
v.full()
@@ -108,8 +108,8 @@
# we actually want to block here, so that the page doesn't refresh
# until the action has completed
diff -urNad zenoss~/Products/ZenModel/migrate/about_zenoss.py zenoss/Products/ZenModel/migrate/about_zenoss.py
---- zenoss~/Products/ZenModel/migrate/about_zenoss.py 2007-07-22 10:39:26.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/about_zenoss.py 2007-07-22 10:39:29.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/about_zenoss.py 2007-09-07 00:29:21.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/about_zenoss.py 2007-09-07 00:29:22.000000000 +0200
@@ -26,7 +26,7 @@
import Migrate
@@ -120,8 +120,8 @@
class AboutZenoss(Migrate.Step):
version = Migrate.Version(0, 23, 0)
diff -urNad zenoss~/Products/ZenModel/migrate/betterstandarderrormessage.py zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py
---- zenoss~/Products/ZenModel/migrate/betterstandarderrormessage.py 2007-07-22 10:39:26.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py 2007-07-22 10:39:29.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/betterstandarderrormessage.py 2007-09-07 00:29:21.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py 2007-09-07 00:29:22.000000000 +0200
@@ -31,7 +31,7 @@
app = dmd.getPhysicalRoot()
if app.hasObject('standard_error_message'):
@@ -132,8 +132,8 @@
zenhome)
try:
diff -urNad zenoss~/Products/ZenModel/migrate/datapoints.py zenoss/Products/ZenModel/migrate/datapoints.py
---- zenoss~/Products/ZenModel/migrate/datapoints.py 2007-07-22 10:39:26.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/datapoints.py 2007-07-22 10:39:29.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/datapoints.py 2007-09-07 00:29:21.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/datapoints.py 2007-09-07 00:29:22.000000000 +0200
@@ -71,7 +71,7 @@
s.datapoints._setObject(p.id, p)
@@ -144,8 +144,8 @@
self.cutoverDataSource(s)
oldname = os.path.join(oldbase + rrdPath, s.id)
diff -urNad zenoss~/Products/ZenModel/migrate/evenbetterstandarderrormessage.py zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py
---- zenoss~/Products/ZenModel/migrate/evenbetterstandarderrormessage.py 2007-07-22 10:39:26.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py 2007-07-22 10:39:29.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/evenbetterstandarderrormessage.py 2007-09-07 00:29:21.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py 2007-09-07 00:29:22.000000000 +0200
@@ -22,7 +22,7 @@
app = dmd.getPhysicalRoot()
if app.hasObject('standard_error_message'):
@@ -156,8 +156,8 @@
zenhome)
try:
diff -urNad zenoss~/Products/ZenModel/migrate/hoist_perf_data.py zenoss/Products/ZenModel/migrate/hoist_perf_data.py
---- zenoss~/Products/ZenModel/migrate/hoist_perf_data.py 2007-07-22 10:39:26.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/hoist_perf_data.py 2007-07-22 10:39:29.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/hoist_perf_data.py 2007-09-07 00:29:21.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/hoist_perf_data.py 2007-09-07 00:29:22.000000000 +0200
@@ -36,7 +36,7 @@
import glob
names = dmd.getDmdRoot('Devices').getOrganizerNames(True)
@@ -168,8 +168,8 @@
names.reverse()
for name in names:
diff -urNad zenoss~/Products/ZenModel/migrate/import_export_filesystem.py zenoss/Products/ZenModel/migrate/import_export_filesystem.py
---- zenoss~/Products/ZenModel/migrate/import_export_filesystem.py 2007-07-22 10:39:26.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/import_export_filesystem.py 2007-07-22 10:39:29.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/import_export_filesystem.py 2007-09-07 00:29:21.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/import_export_filesystem.py 2007-09-07 00:29:22.000000000 +0200
@@ -24,7 +24,7 @@
import Migrate
@@ -180,8 +180,8 @@
class ImportExportFilesystem(Migrate.Step):
version = Migrate.Version(0, 23, 0)
diff -urNad zenoss~/Products/ZenModel/migrate/standarderrormessage.py zenoss/Products/ZenModel/migrate/standarderrormessage.py
---- zenoss~/Products/ZenModel/migrate/standarderrormessage.py 2007-07-22 10:39:26.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/standarderrormessage.py 2007-07-22 10:39:29.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/standarderrormessage.py 2007-09-07 00:29:21.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/standarderrormessage.py 2007-09-07 00:29:22.000000000 +0200
@@ -32,7 +32,7 @@
app = dmd.getPhysicalRoot()
if app.hasObject('standard_error_message'):
@@ -192,8 +192,8 @@
zenhome)
try:
diff -urNad zenoss~/Products/ZenModel/zendmd.py zenoss/Products/ZenModel/zendmd.py
---- zenoss~/Products/ZenModel/zendmd.py 2007-07-22 10:39:26.000000000 +0200
-+++ zenoss/Products/ZenModel/zendmd.py 2007-07-22 10:39:29.000000000 +0200
+--- zenoss~/Products/ZenModel/zendmd.py 2007-09-07 00:29:21.000000000 +0200
++++ zenoss/Products/ZenModel/zendmd.py 2007-09-07 00:29:22.000000000 +0200
@@ -34,7 +34,7 @@
# Itamar Shtull-Trauring of Twisted Python. A current copy of his
# original code is available at http://pastebin.adytum.us/40 though
@@ -204,8 +204,8 @@
def save_history(historyPath=historyPath):
import readline
diff -urNad zenoss~/Products/ZenRRD/zentestcommand.py zenoss/Products/ZenRRD/zentestcommand.py
---- zenoss~/Products/ZenRRD/zentestcommand.py 2007-07-22 10:39:26.000000000 +0200
-+++ zenoss/Products/ZenRRD/zentestcommand.py 2007-07-22 10:39:55.000000000 +0200
+--- zenoss~/Products/ZenRRD/zentestcommand.py 2007-09-07 00:29:21.000000000 +0200
++++ zenoss/Products/ZenRRD/zentestcommand.py 2007-09-07 00:29:22.000000000 +0200
@@ -61,7 +61,7 @@
return dataSource.getCommand(device)
@@ -216,8 +216,8 @@
flags = fcntl.fcntl(child.fromchild, fcntl.F_GETFL)
fcntl.fcntl(child.fromchild, fcntl.F_SETFL, flags | os.O_NDELAY)
diff -urNad zenoss~/Products/ZenUtils/ZCmdBase.py zenoss/Products/ZenUtils/ZCmdBase.py
---- zenoss~/Products/ZenUtils/ZCmdBase.py 2007-07-22 10:39:26.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZCmdBase.py 2007-07-22 10:39:29.000000000 +0200
+--- zenoss~/Products/ZenUtils/ZCmdBase.py 2007-09-07 00:29:21.000000000 +0200
++++ zenoss/Products/ZenUtils/ZCmdBase.py 2007-09-07 00:29:22.000000000 +0200
@@ -27,7 +27,7 @@
from ZenDaemon import ZenDaemon
@@ -228,8 +228,8 @@
defaultCacheDir = os.path.join(defaultCacheDir, 'var')
diff -urNad zenoss~/Products/ZenUtils/ZenBackupBase.py zenoss/Products/ZenUtils/ZenBackupBase.py
---- zenoss~/Products/ZenUtils/ZenBackupBase.py 2007-07-22 10:39:26.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenBackupBase.py 2007-07-22 10:40:00.000000000 +0200
+--- zenoss~/Products/ZenUtils/ZenBackupBase.py 2007-09-07 00:29:21.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenBackupBase.py 2007-09-07 00:29:31.000000000 +0200
@@ -40,7 +40,7 @@
def __init__(self, noopts=0):
@@ -240,8 +240,8 @@
diff -urNad zenoss~/Products/ZenUtils/ZenScriptBase.py zenoss/Products/ZenUtils/ZenScriptBase.py
---- zenoss~/Products/ZenUtils/ZenScriptBase.py 2007-07-22 10:39:26.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenScriptBase.py 2007-07-22 10:39:29.000000000 +0200
+--- zenoss~/Products/ZenUtils/ZenScriptBase.py 2007-09-07 00:29:21.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenScriptBase.py 2007-09-07 00:29:22.000000000 +0200
@@ -23,7 +23,7 @@
from Exceptions import ZentinelException
Modified: trunk/packages/zenoss/debian/patches/ZENHOME50-zen2load.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME50-zen2load.dpatch?rev=289&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME50-zen2load.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME50-zen2load.dpatch Thu Sep 6 22:33:55 2007
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad zenoss~/bin/zen2load.py zenoss/bin/zen2load.py
--- zenoss~/bin/zen2load.py 2007-05-21 22:53:34.000000000 +0200
-+++ zenoss/bin/zen2load.py 2007-07-09 14:03:55.000000000 +0200
++++ zenoss/bin/zen2load.py 2007-09-07 00:29:44.000000000 +0200
@@ -21,7 +21,7 @@
__version__ = "$Revision: 1.3 $"[11:-2]
Modified: trunk/packages/zenoss/debian/patches/ZENHOME60-rm-extra-check-in-zenbuild.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME60-rm-extra-check-in-zenbuild.dpatch?rev=289&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME60-rm-extra-check-in-zenbuild.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME60-rm-extra-check-in-zenbuild.dpatch Thu Sep 6 22:33:55 2007
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad zenoss~/Products/ZenModel/zenbuild.py zenoss/Products/ZenModel/zenbuild.py
---- zenoss~/Products/ZenModel/zenbuild.py 2007-07-09 14:06:27.000000000 +0200
-+++ zenoss/Products/ZenModel/zenbuild.py 2007-07-09 14:07:17.000000000 +0200
+--- zenoss~/Products/ZenModel/zenbuild.py 2007-09-07 00:30:23.000000000 +0200
++++ zenoss/Products/ZenModel/zenbuild.py 2007-09-07 00:30:23.000000000 +0200
@@ -25,9 +25,6 @@
import Globals
import transaction
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=289&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME90-rest-Products.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME90-rest-Products.dpatch Thu Sep 6 22:33:55 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-07-22 17:55:16.000000000 +0200
++++ zenoss/Products/ZenModel/help/Administration.stx 2007-09-07 00:30:58.000000000 +0200
@@ -5,7 +5,7 @@
Environment
@@ -18,8 +18,8 @@
<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-07-22 17:55:16.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/randomExample.py 2007-07-22 17:55:16.000000000 +0200
+--- 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 = {}
@@ -29,9 +29,21 @@
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
+@@ -10,6 +10,8 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
++
+ cd $ZENHOME/Products/
+ svn up
+ zenmigrate
diff -urNad zenoss~/Products/ZenUtils/Graphics.py zenoss/Products/ZenUtils/Graphics.py
---- zenoss~/Products/ZenUtils/Graphics.py 2007-07-22 17:55:16.000000000 +0200
-+++ zenoss/Products/ZenUtils/Graphics.py 2007-07-22 17:55:16.000000000 +0200
+--- 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')
@@ -42,8 +54,8 @@
graph = pydot.graph_from_edges(edges, directed=directed)
graph.ranksep = '1.5'
diff -urNad zenoss~/Products/ZenUtils/ZenBackup.py zenoss/Products/ZenUtils/ZenBackup.py
---- zenoss~/Products/ZenUtils/ZenBackup.py 2007-07-22 17:55:16.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenBackup.py 2007-07-22 17:55:16.000000000 +0200
+--- 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
@@ -126,7 +126,7 @@
default=None,
help='File to backup to.'
@@ -54,9 +66,9 @@
dest="noEventsDb",
default=False,
diff -urNad zenoss~/Products/ZenUtils/zenpack.py zenoss/Products/ZenUtils/zenpack.py
---- zenoss~/Products/ZenUtils/zenpack.py 2007-07-22 17:55:16.000000000 +0200
-+++ zenoss/Products/ZenUtils/zenpack.py 2007-07-22 17:55:53.000000000 +0200
-@@ -156,15 +156,15 @@
+--- 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):
@@ -76,7 +88,7 @@
return packName
-@@ -190,14 +190,14 @@
+@@ -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):
@@ -95,7 +107,7 @@
r = os.system(cmd)
return packName
-@@ -229,7 +229,7 @@
+@@ -272,7 +272,7 @@
action="store_true",
default=False,
help="symlink the zenpack dir instead of"
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=289&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZenossInfo-rrd-version.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZenossInfo-rrd-version.dpatch Thu Sep 6 22:33:55 2007
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad zenoss~/Products/ZenModel/ZenossInfo.py zenoss/Products/ZenModel/ZenossInfo.py
---- zenoss~/Products/ZenModel/ZenossInfo.py 2007-07-10 20:24:17.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenossInfo.py 2007-07-10 20:34:15.000000000 +0200
+--- 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 @@
v = Version(*getRRDToolVersion())
v.full()
Modified: trunk/packages/zenoss/debian/rules-extras.mk
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/rules-extras.mk?rev=289&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/rules-extras.mk (original)
+++ trunk/packages/zenoss/debian/rules-extras.mk Thu Sep 6 22:33:55 2007
@@ -8,6 +8,7 @@
VERSION = $(shell dpkg-parsechangelog | grep '^Version' | sed 's,.* ,,g;s,~.*,,g;s,+r.*,,g;s,-.*,,g')
EXTRAVERSION = $(shell dpkg-parsechangelog | grep '^Version' | sed 's,.* ,,g;s,^$(VERSION),,g;;s,+r.*,,g;s,-.*,,g')
REVISION = $(shell dpkg-parsechangelog | grep '^Version' | grep '+r' | sed 's,.*+r,,g;s,-.*,,g')
+
#if we're building a release there's no revision number in the changelog.
#we get the revision from debian/zenoss-revisions instead.
@@ -146,10 +147,11 @@
rm -rf zendocs/Admin_Guide_1.0_Screens ;\
rm -rf zendocs/Admin\ Guide\ 2.0/screens ;\
rm -rf zendocs/Admin\ Guide\ 2.0/diagrams ;\
+ rm -f zendocs/ZenossAdminGuide-1* ;\
+ rm -f zendocs/ZenossAdminGuide1* ;\
rm -rf zendocs/QuickStartGuide-1.0 zendocs/ZenossQStart-1.0.pdf ;\
find . -name .svnignore -print0 | xargs -0 rm -f ;\
find . -name .cvsignore -print0 | xargs -0 rm -f ;\
- rm -f Products/ZenEvents/docs/rfc3164.txt ;\
mv zendocs/Admin\ Guide\ 2.0 zendocs/Admin_Guide_2.0 ;\
\
echo "packaging the orig.tar.gz and cleaning up" ;\
More information about the Pkg-zenoss-commits
mailing list