[Pkg-zenoss-commits] r221 - in /packages/zenoss/trunk/debian: ./ patches/

bzed-guest at users.alioth.debian.org bzed-guest at users.alioth.debian.org
Mon Jul 9 13:40:18 UTC 2007


Author: bzed-guest
Date: Mon Jul  9 13:40:18 2007
New Revision: 221

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=221
Log:
huge patch, hopefully ready for 2.0.2 now.

Added:
    packages/zenoss/trunk/debian/patches/ZENHOME00-shellscripts.dpatch   (with props)
    packages/zenoss/trunk/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch   (with props)
    packages/zenoss/trunk/debian/patches/ZENHOME02-add-missing-zenfunction-source.dpatch   (with props)
    packages/zenoss/trunk/debian/patches/ZENHOME10-zensocket-location.dpatch   (with props)
    packages/zenoss/trunk/debian/patches/ZENHOME20-import-os.dpatch   (with props)
    packages/zenoss/trunk/debian/patches/ZENHOME30-os.environ.dpatch   (with props)
    packages/zenoss/trunk/debian/patches/ZENHOME40-os.getent.dpatch   (with props)
    packages/zenoss/trunk/debian/patches/ZENHOME50-zen2load.dpatch   (with props)
    packages/zenoss/trunk/debian/patches/ZENHOME60-rm-extra-check-in-zenbuild.dpatch   (with props)
    packages/zenoss/trunk/debian/patches/ZENHOME90-rest-Products.dpatch   (with props)
Removed:
    packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.environ.dpatch
    packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.getent.dpatch
    packages/zenoss/trunk/debian/patches/remove-ZENHOME-rest.dpatch
    packages/zenoss/trunk/debian/patches/remove-ZENHOME-shellscripts.dpatch
    packages/zenoss/trunk/debian/patches/zenfunctions-pythonpath.dpatch
    packages/zenoss/trunk/debian/patches/zensocket-location.dpatch
Modified:
    packages/zenoss/trunk/debian/changelog
    packages/zenoss/trunk/debian/control
    packages/zenoss/trunk/debian/patches/00list
    packages/zenoss/trunk/debian/rules
    packages/zenoss/trunk/debian/rules-extras.mk
    packages/zenoss/trunk/debian/zenoss-doc.doc-base
    packages/zenoss/trunk/debian/zenoss-doc.install

Modified: packages/zenoss/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/changelog?rev=221&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/changelog (original)
+++ packages/zenoss/trunk/debian/changelog Mon Jul  9 13:40:18 2007
@@ -20,6 +20,11 @@
   * debian/rules:
     - run dh_installdebconf before dh_installdeb
     - add missing perf directory to our Zope skeleton
+  * debian/control:
+    - adding rsync to deps. as it is used in one of the Zenoss tools
+  * debian/patches:
+    - refactoring all ZENHOME-patches to fit the new version and to be more
+      easily upgradeable
 
  -- Stefano Zacchiroli <zack at debian.org>  Tue, 03 Jul 2007 23:27:28 +0200
 

Modified: packages/zenoss/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/control?rev=221&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/control (original)
+++ packages/zenoss/trunk/debian/control Mon Jul  9 13:40:18 2007
@@ -12,7 +12,7 @@
 Package: zenoss
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, ${zope:Depends},
- adduser, dbconfig-common (>= 1.8.35), snmp,
+ adduser, dbconfig-common (>= 1.8.35), snmp, rsync,
  python-elementtree (>= 1.2.6), python-epydoc (>= 2.1),
  python-mysqldb (>= 1.2.0),
  python-pydot (>= 0.9.10), python-simplejson (>= 1.4),

Modified: packages/zenoss/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/00list?rev=221&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/patches/00list (original)
+++ packages/zenoss/trunk/debian/patches/00list Mon Jul  9 13:40:18 2007
@@ -1,10 +1,14 @@
 pdis-distutils
 testgen-distutils
-remove-ZENHOME-os.environ
-remove-ZENHOME-shellscripts
-remove-ZENHOME-os.getent
-remove-ZENHOME-rest
-zenfunctions-pythonpath
-zensocket-location
 drop_triggers_before_db_creation
 bypass_eula
+ZENHOME00-shellscripts
+ZENHOME01-zenfunctions-pythonpath
+ZENHOME02-add-missing-zenfunction-source
+ZENHOME10-zensocket-location
+ZENHOME20-import-os
+ZENHOME30-os.environ
+ZENHOME40-os.getent
+ZENHOME50-zen2load
+ZENHOME60-rm-extra-check-in-zenbuild
+ZENHOME90-rest-Products

Added: packages/zenoss/trunk/debian/patches/ZENHOME00-shellscripts.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/ZENHOME00-shellscripts.dpatch?rev=221&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/ZENHOME00-shellscripts.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/ZENHOME00-shellscripts.dpatch Mon Jul  9 13:40:18 2007
@@ -1,0 +1,452 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ZENHOME01-shellscripts.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: sed -i 's,$ZENHOME/bin/zenfunctions,$(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions,g' *
+## DP: replacing the place of the zenfunctions include, and set $ZENHOME in there.
+## DP: more easy to update the patch this way.
+
+ at 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-09 12:31:15.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/lib/python/ZODB
+ 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-09 12:31:15.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/ZenEvents
+ 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-09 12:31:15.000000000 +0200
+@@ -10,5 +10,5 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+ 
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ $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-09 12:31:15.000000000 +0200
+@@ -10,5 +10,5 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+ 
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ $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-09 12:31:15.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
+ 
+ $PYTHON $ZENHOME/Products/ZenModel/zenbuild.py "$CMD" "$@"
+ 
+diff -urNad zenoss~/bin/zenchkrels zenoss/bin/zenchkrels
+--- zenoss~/bin/zenchkrels	2007-04-26 20:57:02.000000000 +0200
++++ zenoss/bin/zenchkrels	2007-07-09 12:31:15.000000000 +0200
+@@ -9,5 +9,5 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+-. $ZENHOME/bin/zenfunctions 
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions 
+ $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-09 12:31:15.000000000 +0200
+@@ -9,5 +9,5 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+-. $ZENHOME/bin/zenfunctions 
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions 
+ $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-09 12:31:15.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=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-09 12:31:15.000000000 +0200
+@@ -9,5 +9,5 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+-. $ZENHOME/bin/zenfunctions 
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions 
+ $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-09 12:31:15.000000000 +0200
+@@ -9,5 +9,5 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+-. $ZENHOME/bin/zenfunctions 
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions 
+ $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-09 12:31:15.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
+ 
+ SUDO="$ZENHOME/bin/zensocket --ping -- "
+ 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-09 12:31:15.000000000 +0200
+@@ -12,5 +12,5 @@
+ 
+ # For some reason the zenfunctions line eats part of $*.  Store
+ # value now to use in call to zendmd.py
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ $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-09 12:31:15.000000000 +0200
+@@ -9,7 +9,7 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ rm -rf $ZENHOME/zendocs/api
+ mkdir -p $ZENHOME/zendocs/api
+ 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-09 12:31:15.000000000 +0200
+@@ -9,5 +9,5 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+-. $ZENHOME/bin/zenfunctions 
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions 
+ $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-09 12:31:15.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/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-09 12:31: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-09 12:31:15.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/ZenHub
+ 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-09 12:31:15.000000000 +0200
+@@ -9,5 +9,5 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+-. $ZENHOME/bin/zenfunctions 
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions 
+ $PYTHON $ZENHOME/Products/ZenRelations/ImportRM.py "$CMD" $*
+diff -urNad zenoss~/bin/zenmail zenoss/bin/zenmail
+--- zenoss~/bin/zenmail	2007-07-03 21:28:36.000000000 +0200
++++ zenoss/bin/zenmail	2007-07-09 12:31:15.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
+ 
+ SUDO="$ZENHOME/bin/zensocket --listen --proto=tcp --port=25 -- "
+ 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-09 12:31:15.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/ZenModel
+ 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-09 12:31:15.000000000 +0200
+@@ -12,5 +12,5 @@
+ 
+ # For some reason the zenfunctions line eats part of $*.  Store
+ # value now to use in call to zendmd.py
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ $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-09 12:31:15.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/DataCollector
+diff -urNad zenoss~/bin/zenoss zenoss/bin/zenoss
+--- zenoss~/bin/zenoss	2007-05-21 17:23:04.000000000 +0200
++++ zenoss/bin/zenoss	2007-07-09 12:31:15.000000000 +0200
+@@ -49,7 +49,7 @@
+    exec su - $USERNAME $0 $@
+ fi
+ 
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ C=
+ C="$C zeoctl"
+ 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-09 12:31:15.000000000 +0200
+@@ -10,5 +10,5 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+ 
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ $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-09 12:31:15.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=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-09 12:31:15.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-09 12:31:15.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
+ 
+ SUDO="$ZENHOME/bin/zensocket --ping -- "
+ 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-09 12:31:15.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
+ 
+ SUDO=""
+ 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-09 12:31:15.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=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-09 12:31:15.000000000 +0200
+@@ -16,7 +16,7 @@
+         echo No actions taken.
+         exit
+ else
+-    . $ZENHOME/bin/zenfunctions
++    . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ 
+     cd $ZENHOME/Products
+ 
+diff -urNad zenoss~/bin/zenrender zenoss/bin/zenrender
+--- zenoss~/bin/zenrender	2007-04-20 15:48:17.000000000 +0200
++++ zenoss/bin/zenrender	2007-07-09 12:31:15.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=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-09 12:31:15.000000000 +0200
+@@ -10,5 +10,5 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+ 
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ $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-09 12:31:15.000000000 +0200
+@@ -9,5 +9,5 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+-. $ZENHOME/bin/zenfunctions 
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions 
+ $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-09 12:31:15.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/ZenStatus
+ 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-09 12:31:15.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
+ 
+ SUDO="$ZENHOME/bin/zensocket --listen  --proto=udp --port=514 -- "
+ PRGHOME=$ZENHOME/Products/ZenEvents
+diff -urNad zenoss~/bin/zentrap zenoss/bin/zentrap
+--- zenoss~/bin/zentrap	2007-07-03 21:28:36.000000000 +0200
++++ zenoss/bin/zentrap	2007-07-09 12:31:15.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
+ 
+ SUDO="$ZENHOME/bin/zensocket --listen --proto=udp --port=162 -- "
+ 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-09 12:31:15.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/ZenWin
+ 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-09 12:31:15.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/ZenWin
+ 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-09 12:31:15.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
+ 
+ NAME=zproprmlocal
+ PRGHOME=$ZENHOME/Products/ZenUtils

Propchange: packages/zenoss/trunk/debian/patches/ZENHOME00-shellscripts.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/zenoss/trunk/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch?rev=221&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch Mon Jul  9 13:40:18 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ZENHOME01-zenfunctions-pythonpath.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: we don't bring our own python, use the system-wide installation
+
+ at DPATCH@
+diff -urNad zenoss~/bin/zenfunctions zenoss/bin/zenfunctions
+--- zenoss~/bin/zenfunctions	2007-07-09 12:44:32.000000000 +0200
++++ zenoss/bin/zenfunctions	2007-07-09 12:45:06.000000000 +0200
+@@ -23,7 +23,7 @@
+    ZOPEHOME=/usr/lib/zope
+ fi
+ 
+-PYTHON=$ZOPEHOME/bin/python
++PYTHON=/usr/bin/python2.4
+ PYTHONPATH=$ZENHOME/lib/python:$ZOPEHOME/lib/python
+ export PYTHONPATH
+ 

Propchange: packages/zenoss/trunk/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/zenoss/trunk/debian/patches/ZENHOME02-add-missing-zenfunction-source.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/ZENHOME02-add-missing-zenfunction-source.dpatch?rev=221&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/ZENHOME02-add-missing-zenfunction-source.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/ZENHOME02-add-missing-zenfunction-source.dpatch Mon Jul  9 13:40:18 2007
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## foo.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+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
+@@ -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
+ 
+ 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
+@@ -9,5 +9,8 @@
+ #
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
++
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
++
+ export INSTANCE_HOME=$ZENHOME
+ $ZENHOME/bin/python $ZENHOME/Products/ZenRRD/zenstep.py $@

Propchange: packages/zenoss/trunk/debian/patches/ZENHOME02-add-missing-zenfunction-source.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/zenoss/trunk/debian/patches/ZENHOME10-zensocket-location.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/ZENHOME10-zensocket-location.dpatch?rev=221&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/ZENHOME10-zensocket-location.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/ZENHOME10-zensocket-location.dpatch Mon Jul  9 13:40:18 2007
@@ -1,0 +1,67 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ZENHOME02zensocket-location.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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
+@@ -12,7 +12,7 @@
+ 
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ 
+-SUDO="$ZENHOME/bin/zensocket --ping -- "
++SUDO="/usr/lib/zenoss/bin/zensocket --ping -- "
+ PRGHOME=$ZENHOME/Products/DataCollector
+ 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
+@@ -12,7 +12,7 @@
+ 
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ 
+-SUDO="$ZENHOME/bin/zensocket --listen --proto=tcp --port=25 -- "
++SUDO="/usr/lib/zenoss/bin/zensocket --listen --proto=tcp --port=25 -- "
+ PRGHOME=$ZENHOME/Products/ZenEvents
+ 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
+@@ -12,7 +12,7 @@
+ 
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ 
+-SUDO="$ZENHOME/bin/zensocket --ping -- "
++SUDO="/usr/lib/zenoss/bin/zensocket --ping -- "
+ PRGHOME=$ZENHOME/Products/ZenStatus
+ 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
+@@ -12,7 +12,7 @@
+ 
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ 
+-SUDO="$ZENHOME/bin/zensocket --listen  --proto=udp --port=514 -- "
++SUDO="/usr/lib/zenoss/bin/zensocket --listen  --proto=udp --port=514 -- "
+ PRGHOME=$ZENHOME/Products/ZenEvents
+ 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
+@@ -12,7 +12,7 @@
+ 
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ 
+-SUDO="$ZENHOME/bin/zensocket --listen --proto=udp --port=162 -- "
++SUDO="/usr/lib/zenoss/bin/zensocket --listen --proto=udp --port=162 -- "
+ PRGHOME=$ZENHOME/Products/ZenEvents
+ PRGNAME=zentrap.py
+ CFGFILE=$CFGDIR/zentrap.conf

Propchange: packages/zenoss/trunk/debian/patches/ZENHOME10-zensocket-location.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/zenoss/trunk/debian/patches/ZENHOME20-import-os.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/ZENHOME20-import-os.dpatch?rev=221&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/ZENHOME20-import-os.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/ZENHOME20-import-os.dpatch Mon Jul  9 13:40:18 2007
@@ -1,0 +1,635 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ZENHOME20-import-os.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: cd Products; grep -lr ZENHOME * | xargs sed -i 's/import os/import pwd, os/g'
+## DP: we need the pwd module to be able to replace ZENHOME properly.
+
+ at 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-07-09 13:02:20.000000000 +0200
+@@ -11,7 +11,7 @@
+ #
+ ###########################################################################
+ import sys
+-import os
++import pwd, os
+ import socket
+ import time
+ import Globals
+diff -urNad zenoss~/Products/ZenEvents/zensyslog.py zenoss/Products/ZenEvents/zensyslog.py
+--- zenoss~/Products/ZenEvents/zensyslog.py	2007-05-11 20:36:04.000000000 +0200
++++ zenoss/Products/ZenEvents/zensyslog.py	2007-07-09 13:02:20.000000000 +0200
+@@ -21,7 +21,7 @@
+ 
+ import time
+ import socket 
+-import os
++import pwd, os
+ 
+ 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-05-15 16:32:22.000000000 +0200
++++ zenoss/Products/ZenHub/zenhub.py	2007-07-09 13:02:20.000000000 +0200
+@@ -22,7 +22,7 @@
+ __version__ = "$Revision$"[11:-2]
+ 
+ from socket import getfqdn
+-import os
++import pwd, os
+ 
+ 
+ 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-07-09 13:00:15.000000000 +0200
++++ zenoss/Products/ZenModel/DataRoot.py	2007-07-09 13:02:20.000000000 +0200
+@@ -464,7 +464,7 @@
+         pack.organization = organization
+         pack.version = version
+         self.packs._setObject(id, pack)
+-        import os
++        import pwd, os
+         zp = os.path.join(os.environ['ZENHOME'], 'Products', id)
+         if not os.path.isdir(zp):
+             os.makedirs(zp, 0750)
+@@ -483,9 +483,9 @@
+ 
+     def removeZenPacks(self, ids=(), REQUEST = None):
+         """remove a ZenPack"""
+-        import os
++        import pwd, os
+         zp = os.path.join(os.environ['ZENHOME'], 'bin', 'zenpack')
+-        import os
++        import pwd, os
+         for pack in ids:
+             os.system('%s run --remove %s' % (zp, pack))
+         self._p_jar.sync()
+diff -urNad zenoss~/Products/ZenModel/DeviceClass.py zenoss/Products/ZenModel/DeviceClass.py
+--- zenoss~/Products/ZenModel/DeviceClass.py	2007-06-29 22:53:35.000000000 +0200
++++ zenoss/Products/ZenModel/DeviceClass.py	2007-07-09 13:02:20.000000000 +0200
+@@ -17,7 +17,7 @@
+ 
+ __version__ = "$Revision: 1.76 $"[11:-2]
+ 
+-import os
++import pwd, os
+ import types
+ 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-07-09 13:02:20.000000000 +0200
+@@ -20,7 +20,7 @@
+ 
+ __version__ = "$Revision: 1.22 $"[11:-2]
+ 
+-import os
++import pwd, os
+ import sys
+ import math
+ import transaction
+@@ -436,7 +436,7 @@
+         for organizerName in organizerPaths:
+             try:
+                 organizer = orgroot.getOrganizer(organizerName)
+-                import os
++                import pwd, os
+                 zd = os.path.join(os.environ['ZENHOME'], 'bin', 'zendisc')
+                 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-07-09 13:02:20.000000000 +0200
+@@ -20,7 +20,7 @@
+ 
+ __version__ = "$Revision: 1.30 $"[11:-2]
+ 
+-import os
++import pwd, os
+ import glob
+ import zlib
+ import transaction
+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-07-09 13:02:20.000000000 +0200
+@@ -17,7 +17,7 @@
+ 
+ __version__ = "$Revision: 1.50 $"[11:-2]
+ 
+-import os
++import pwd, os
+ import time
+ 
+ from DateTime import DateTime
+diff -urNad zenoss~/Products/ZenModel/ZenPack.py zenoss/Products/ZenModel/ZenPack.py
+--- zenoss~/Products/ZenModel/ZenPack.py	2007-07-05 22:09:00.000000000 +0200
++++ zenoss/Products/ZenModel/ZenPack.py	2007-07-09 13:02:20.000000000 +0200
+@@ -19,7 +19,7 @@
+ from Products.ZenUtils.Utils import importClass
+ import transaction
+ 
+-import os
++import pwd, os
+ 
+ __doc__="ZenPacks base definitions"
+ 
+diff -urNad zenoss~/Products/ZenModel/ZenPackLoader.py zenoss/Products/ZenModel/ZenPackLoader.py
+--- zenoss~/Products/ZenModel/ZenPackLoader.py	2007-06-27 16:09:30.000000000 +0200
++++ zenoss/Products/ZenModel/ZenPackLoader.py	2007-07-09 13:02:20.000000000 +0200
+@@ -17,7 +17,7 @@
+ from Products.ZenReports.ReportLoader import ReportLoader
+ from Products.ZenUtils.Utils import getObjByPath
+ 
+-import os
++import pwd, os
+ import logging
+ 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-07-09 13:02:20.000000000 +0200
+@@ -11,7 +11,7 @@
+ #
+ ###########################################################################
+ 
+-import os
++import pwd, os
+ import re
+ import time
+ 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-07-09 13:02:20.000000000 +0200
+@@ -41,7 +41,7 @@
+ 
+ def cleanup():
+     "recursively remove all files ending with .pyc"
+-    import os
++    import pwd, os
+     for p, d, fs in os.walk(os.path.join(os.environ['ZENHOME'], 'Products')):
+         for f in fs: 
+             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-07-09 13:02:20.000000000 +0200
+@@ -20,7 +20,7 @@
+ 
+ __version__ = "$Revision$"[11:-2]
+ 
+-import os
++import pwd, os
+ 
+ from Products.ZenModel.ZenossInfo import manage_addZenossInfo
+ 
+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-07-09 13:02:20.000000000 +0200
+@@ -20,7 +20,7 @@
+ __version__ = "$Revision$"[11:-2]
+ 
+ import Migrate
+-import os
++import pwd, os
+ 
+ class BetterStandardErrorMessage(Migrate.Step):
+     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-07-09 13:02:20.000000000 +0200
+@@ -29,7 +29,7 @@
+             dmd.Devices._setProperty(name, default, **kw)
+         
+     def cutover(self, dmd):
+-        import os
++        import pwd, os
+         self.update(dmd, "zNagiosPath", "zCommandPath",
+                     os.path.join(os.environ['ZENHOME'], 'libexec'))
+         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-04-20 15:25:38.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/datapoints.py	2007-07-09 13:02:20.000000000 +0200
+@@ -19,7 +19,7 @@
+ 
+ __version__ = "$Revision$"[11:-2]
+ 
+-import os
++import pwd, os
+ import sys
+ import Migrate
+ 
+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-07-09 13:02:20.000000000 +0200
+@@ -11,7 +11,7 @@
+ '''
+ 
+ import Migrate
+-import os
++import pwd, os
+ 
+ class EvenBetterStandardErrorMessage(Migrate.Step):
+     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-07-09 13:02:20.000000000 +0200
+@@ -23,7 +23,7 @@
+ 
+ import Migrate
+ 
+-import os
++import pwd, os
+ 
+ class HoistPerfData(Migrate.Step):
+     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-07-09 13:02:20.000000000 +0200
+@@ -20,7 +20,7 @@
+ 
+ __version__ = "$Revision$"[11:-2]
+ 
+-import os
++import pwd, os
+ 
+ import Migrate
+ 
+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-07-09 13:02:20.000000000 +0200
+@@ -21,7 +21,7 @@
+ 
+ __version__ = "$Revision$"[11:-2]
+ 
+-import os
++import pwd, os
+ 
+ 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-06-28 17:44:35.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/menus.py	2007-07-09 13:02:20.000000000 +0200
+@@ -19,7 +19,7 @@
+ $Id:$
+ '''
+ import Migrate
+-import os
++import pwd, os
+ from Products.ZenRelations.ImportRM import ImportRM
+ from Products.ZenModel.DeviceClass import DeviceClass
+ 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-07-09 13:02:20.000000000 +0200
+@@ -20,7 +20,7 @@
+ __version__ = "$Revision$"[11:-2]
+ 
+ import Migrate
+-import os
++import pwd, os
+ 
+ class Processes(Migrate.Step):
+     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-07-09 13:02:20.000000000 +0200
+@@ -21,8 +21,8 @@
+     version = Migrate.Version(1, 1, 0)
+ 
+     def cutover(self, dmd):
+-        import os
+-        import os.path
++        import pwd, os
++        import pwd, os.path
+         procs = os.path.join(
+                     os.environ['ZENHOME'], 'Products', 'ZenEvents', 'db', 'zenprocs.sql')
+         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-07-09 13:02:20.000000000 +0200
+@@ -20,7 +20,7 @@
+ 
+ __version__ = "$Revision$"[11:-2]
+ 
+-import os
++import pwd, os
+ import re
+ 
+ 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-07-09 13:02:20.000000000 +0200
+@@ -17,7 +17,7 @@
+ 
+ '''
+ import Migrate
+-import os.path
++import pwd, os.path
+ 
+ def parseconfig(options):
+     """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-07-09 13:02:20.000000000 +0200
+@@ -11,7 +11,7 @@
+ #
+ ###########################################################################
+ #!/usr/bin/python
+-import os
++import pwd, os
+ for d, dirs, filenames in os.walk(os.path.join(os.environ['ZENHOME'], 'perf')):
+     for f in filenames:
+         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-07-09 13:02:20.000000000 +0200
+@@ -20,7 +20,7 @@
+ __version__ = "$Revision$"[11:-2]
+ 
+ import Migrate
+-import os
++import pwd, os
+ 
+ class StandardErrorMessage(Migrate.Step):
+     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-06-07 00:42:16.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/twopointohobjects.py	2007-07-09 13:02:20.000000000 +0200
+@@ -25,7 +25,7 @@
+         dmd.Devices.manage_addRRDTemplate('softwareLoopback')
+ 
+     def _zCommandPath(self, dmd):
+-        import os
++        import pwd, os
+         dmd.Devices.zCommandPath = os.path.join(os.environ['ZENHOME'], 'libexec')
+ 
+     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-07-09 13:02:20.000000000 +0200
+@@ -20,7 +20,7 @@
+ __version__ = "$Revision: 1.11 $"[11:-2]
+ 
+ import sys
+-import os
++import pwd, os
+ 
+ import Globals
+ 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-07-09 13:02:20.000000000 +0200
+@@ -11,7 +11,7 @@
+ #
+ ###########################################################################
+ 
+-import os
++import pwd, os
+ import atexit
+ import socket
+ 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-07-09 13:02:20.000000000 +0200
+@@ -11,7 +11,7 @@
+ #
+ ###########################################################################
+ import sys
+-import os
++import pwd, os
+ import glob
+ from sets import Set
+ import pprint
+diff -urNad zenoss~/Products/ZenRRD/RenderServer.py zenoss/Products/ZenRRD/RenderServer.py
+--- zenoss~/Products/ZenRRD/RenderServer.py	2007-07-05 22:09:00.000000000 +0200
++++ zenoss/Products/ZenRRD/RenderServer.py	2007-07-09 13:02:20.000000000 +0200
+@@ -19,7 +19,7 @@
+ 
+ __version__ = "$Revision: 1.14 $"[11:-2]
+ 
+-import os
++import pwd, os
+ import time
+ import logging
+ 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-07-09 13:02:20.000000000 +0200
+@@ -11,7 +11,7 @@
+ #
+ ###########################################################################
+ 
+-import os
++import pwd, os
+ import time
+ import rrdtool
+ 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-07-09 13:02:20.000000000 +0200
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-import os
++import pwd, os
+ import time
+ import re
+ 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-07-09 13:02:20.000000000 +0200
+@@ -11,7 +11,7 @@
+ #
+ ###########################################################################
+ 
+-import os
++import pwd, os
+ import time
+ import glob
+ 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-07-09 13:02:20.000000000 +0200
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-import os
++import pwd, os
+ import time
+ import glob
+ 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-07-09 13:02:20.000000000 +0200
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-import os
++import pwd, os
+ import time
+ import re
+ 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-07-09 13:02:20.000000000 +0200
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-import os
++import pwd, os
+ import time
+ import glob
+ 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-07-09 13:02:20.000000000 +0200
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-import os
++import pwd, os
+ import time
+ 
+ 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-07-09 13:02:20.000000000 +0200
+@@ -13,7 +13,7 @@
+ 
+ # It probably isn't a great example to follow style-wise.
+ 
+-import os
++import pwd, os
+ import time
+ import glob
+ 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-07-09 13:02:20.000000000 +0200
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-import os
++import pwd, os
+ import time
+ import glob
+ import rrdtool
+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-07-09 13:02:20.000000000 +0200
+@@ -25,7 +25,7 @@
+ from Products.ZenModel.ZenModelRM import ZenModelRM
+ from Products.ZenUtils.Utils import importClass
+ 
+-import os
++import pwd, os
+ import sys
+ 
+ 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-07-09 13:02:20.000000000 +0200
+@@ -20,7 +20,7 @@
+ __version__ = "$Revision: 1.9 $"[11:-2]
+ 
+ import signal
+-import os
++import pwd, os
+ import sys
+ import socket
+ 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-07-09 13:02:20.000000000 +0200
+@@ -58,7 +58,7 @@
+ 
+ 
+     def setGraphFromEdges(self, edges, directed=True):
+-        import os, os.path
++        import pwd, os, os.path
+         config = os.path.join(os.environ['ZENHOME'], 'lib/graphviz/config')
+         if not os.path.exists(config) or os.path.getsize(config) == 0:
+             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-07-09 13:02:20.000000000 +0200
+@@ -26,7 +26,7 @@
+ from Exceptions import ZentinelException
+ from ZenDaemon import ZenDaemon
+ 
+-import os
++import pwd, os
+ defaultCacheDir = os.getenv('ZENHOME')
+ if defaultCacheDir is not None:
+     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-07-09 13:02:20.000000000 +0200
+@@ -21,8 +21,8 @@
+ import Globals
+ from ZCmdBase import ZCmdBase
+ import sys
+-import os
+-import os.path
++import pwd, os
++import pwd, os.path
+ from datetime import date
+ import getpass
+ 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-07-09 13:02:20.000000000 +0200
+@@ -18,8 +18,8 @@
+ Common code for zenbackup.py and zenrestore.py
+ '''
+ 
+-import os
+-import os.path
++import pwd, os
++import pwd, os.path
+ import tempfile
+ from CmdBase import CmdBase
+ 
+diff -urNad zenoss~/Products/ZenUtils/ZenDaemon.py zenoss/Products/ZenUtils/ZenDaemon.py
+--- zenoss~/Products/ZenUtils/ZenDaemon.py	2007-07-06 20:35:37.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenDaemon.py	2007-07-09 13:02:20.000000000 +0200
+@@ -20,7 +20,7 @@
+ __version__ = "$Revision: 1.9 $"[11:-2]
+ 
+ import sys
+-import os
++import pwd, os
+ import pwd
+ import signal
+ 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-07-09 13:02:20.000000000 +0200
+@@ -22,7 +22,7 @@
+ 
+ from Exceptions import ZentinelException
+ 
+-import os
++import pwd, os
+ defaultCacheDir = os.getenv('ZENHOME')
+ if defaultCacheDir is not None:
+     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-05 22:09:00.000000000 +0200
++++ zenoss/Products/ZenUtils/zenpack.py	2007-07-09 13:02:20.000000000 +0200
+@@ -18,7 +18,7 @@
+ from Products.ZenUtils.Utils import cleanupSkins
+ import transaction
+ 
+-import os, sys
++import pwd, os, sys
+ 
+ class ZenPackCmd(ZenScriptBase):
+     "Manage ZenPacks"

Propchange: packages/zenoss/trunk/debian/patches/ZENHOME20-import-os.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/zenoss/trunk/debian/patches/ZENHOME30-os.environ.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/ZENHOME30-os.environ.dpatch?rev=221&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/ZENHOME30-os.environ.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/ZENHOME30-os.environ.dpatch Mon Jul  9 13:40:18 2007
@@ -1,0 +1,454 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ZENHOME30-os.environ.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: cd Products; grep -lr ZENHOME * | xargs sed -i "s/os.environ\['ZENHOME'\]/pwd.getpwnam('zenoss')[5]/g"
+
+ at 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
+@@ -15,7 +15,7 @@
+ import socket
+ import time
+ import Globals
+-zhome = os.environ['ZENHOME']
++zhome = pwd.getpwnam('zenoss')[5]
+ logdir = os.path.join(zhome, "log")
+ 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
+@@ -57,7 +57,7 @@
+             self.olog = logging.getLogger("origsyslog")
+             self.olog.setLevel(20)
+             self.olog.propagate = False
+-            lname = os.path.join(os.environ['ZENHOME'],"log","origsyslog.log")
++            lname = os.path.join(pwd.getpwnam('zenoss')[5],"log","origsyslog.log")
+             hdlr = logging.FileHandler(lname)
+             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', 
+                                dest='passwordfile',
+                                type='string',
+-                               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 @@
+         pack.version = version
+         self.packs._setObject(id, pack)
+         import pwd, os
+-        zp = os.path.join(os.environ['ZENHOME'], 'Products', id)
++        zp = os.path.join(pwd.getpwnam('zenoss')[5], 'Products', id)
+         if not os.path.isdir(zp):
+             os.makedirs(zp, 0750)
+             for d in ['objects', 'skins', 'modeler/plugins',
+@@ -484,7 +484,7 @@
+     def removeZenPacks(self, ids=(), REQUEST = None):
+         """remove a ZenPack"""
+         import pwd, os
+-        zp = os.path.join(os.environ['ZENHOME'], 'bin', 'zenpack')
++        zp = os.path.join(pwd.getpwnam('zenoss')[5], 'bin', 'zenpack')
+         import pwd, os
+         for pack in ids:
+             os.system('%s run --remove %s' % (zp, pack))
+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 @@
+             try:
+                 organizer = orgroot.getOrganizer(organizerName)
+                 import pwd, os
+-                zd = os.path.join(os.environ['ZENHOME'], 'bin', 'zendisc')
++                zd = os.path.join(pwd.getpwnam('zenoss')[5], 'bin', 'zendisc')
+                 zendiscCmd = "%s run --net=%s" % (zd, organizer.id)
+                 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")
+ 
+ def performancePath(target):
+     if target.startswith("/"): target = target[1:]
+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 *
+ 
+ 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):
+ 
+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 @@
+ 
+ 
+     def binPath(self, daemon):
+-        return os.path.join(os.environ['ZENHOME'],
++        return os.path.join(pwd.getpwnam('zenoss')[5],
+                             'bin',
+                             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
+@@ -42,7 +42,7 @@
+ def cleanup():
+     "recursively remove all files ending with .pyc"
+     import pwd, os
+-    for p, d, fs in os.walk(os.path.join(os.environ['ZENHOME'], 'Products')):
++    for p, d, fs in os.walk(os.path.join(pwd.getpwnam('zenoss')[5], 'Products')):
+         for f in fs: 
+             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
+@@ -31,7 +31,7 @@
+     def cutover(self, dmd):
+         import pwd, os
+         self.update(dmd, "zNagiosPath", "zCommandPath",
+-                    os.path.join(os.environ['ZENHOME'], 'libexec'))
++                    os.path.join(pwd.getpwnam('zenoss')[5], 'libexec'))
+         if dmd.Devices.hasProperty("zNagiosCycleTime"):
+             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
+@@ -93,7 +93,7 @@
+             from Products.ZenRelations.ImportRM import ImportRM
+             imp = ImportRM(noopts=True, app=dmd.getPhysicalRoot())
+             imp.options.noCommit = True
+-            imp.options.infile = os.path.join(os.environ['ZENHOME'],
++            imp.options.infile = os.path.join(pwd.getpwnam('zenoss')[5],
+                 'Products', 'ZenModel', 'data', 'rrdconfig.update')
+             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
+@@ -24,7 +24,7 @@
+ from Products.ZenModel.DeviceClass import DeviceClass
+ from Products.ZenModel.Device import Device
+ 
+-zenhome = os.environ['ZENHOME']
++zenhome = pwd.getpwnam('zenoss')[5]
+ menuxml = os.path.join(zenhome, "Products/ZenModel/data/menus.xml")
+ 
+ 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
+@@ -41,7 +41,7 @@
+             imp = ImportRM(noopts=True, app=dmd.getPhysicalRoot())
+             imp.options.noCommit = True
+             imp.options.noindex = True
+-            imp.options.infile = os.path.join(os.environ['ZENHOME'],
++            imp.options.infile = os.path.join(pwd.getpwnam('zenoss')[5],
+                 'Products', 'ZenModel', 'data', 'osproc.update')
+             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
+@@ -24,7 +24,7 @@
+         import pwd, os
+         import pwd, os.path
+         procs = os.path.join(
+-                    os.environ['ZENHOME'], 'Products', 'ZenEvents', 'db', 'zenprocs.sql')
++                    pwd.getpwnam('zenoss')[5], 'Products', 'ZenEvents', 'db', 'zenprocs.sql')
+         os.system('cat %s | mysql -u%s -p%s %s' % (
+                     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
+@@ -36,7 +36,7 @@
+     version = Migrate.Version(0, 22, 0)
+ 
+     def setMin(self, value):
+-        for d,_, files in os.walk(os.path.join(os.environ['ZENHOME'], "perf")):
++        for d,_, files in os.walk(os.path.join(pwd.getpwnam('zenoss')[5], "perf")):
+             for f in [f for f in files if rrd.match(f)]:
+                 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
+@@ -46,7 +46,7 @@
+     def cutover(self, dmd):
+         options = OptionsBucket()
+         options.configfile = os.path.join(
+-                            os.environ['ZENHOME'], 'etc', 'zenactions.conf')
++                            pwd.getpwnam('zenoss')[5], 'etc', 'zenactions.conf')
+         parseconfig(options)
+         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
+@@ -12,7 +12,7 @@
+ ###########################################################################
+ #!/usr/bin/python
+ import pwd, os
+-for d, dirs, filenames in os.walk(os.path.join(os.environ['ZENHOME'], 'perf')):
++for d, dirs, filenames in os.walk(os.path.join(pwd.getpwnam('zenoss')[5], 'perf')):
+     for f in filenames:
+         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
+@@ -26,7 +26,7 @@
+ 
+     def _zCommandPath(self, dmd):
+         import pwd, os
+-        dmd.Devices.zCommandPath = os.path.join(os.environ['ZENHOME'], 'libexec')
++        dmd.Devices.zCommandPath = os.path.join(pwd.getpwnam('zenoss')[5], 'libexec')
+ 
+     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
+@@ -29,7 +29,7 @@
+     print "ERROR: ZENHOME envrionment variable not set"
+     sys.exit(1)
+ 
+-zenhome = os.environ['ZENHOME']
++zenhome = pwd.getpwnam('zenoss')[5]
+ 
+ import Globals
+ 
+@@ -45,7 +45,7 @@
+         if not os.environ.has_key("ZENHOME"):
+             print "ERROR: ZENHOME not set."
+             sys.exit(1)
+-        zopeconf = os.path.join(os.environ['ZENHOME'], "etc/zope.conf")
++        zopeconf = os.path.join(pwd.getpwnam('zenoss')[5], "etc/zope.conf")
+         import Zope2
+         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
+@@ -137,7 +137,7 @@
+ 
+     def load(self):
+ 
+-        smimibdir = os.path.join(os.environ['ZENHOME'], 'share/mibs')
++        smimibdir = os.path.join(pwd.getpwnam('zenoss')[5], 'share/mibs')
+         ietf, iana, irtf, tubs, site = \
+               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 @@
+         "render a custom graph and return it"
+         try:
+             dmd = self.dmd
+-            m = os.path.join(os.environ['ZENHOME'],
++            m = os.path.join(pwd.getpwnam('zenoss')[5],
+                              'Products/ZenRRD/plugins/%s.py' % name)
+             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
+@@ -39,7 +39,7 @@
+ fname = "%s/graph-%s.png" % (TMPDIR,name)
+ cmd = [fname,] + basicArgs(env) + args
+ 
+-perf = os.path.join(os.environ['ZENHOME'], 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss')[5], 'perf')
+ rpn = env['rpn']
+ 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
+@@ -45,7 +45,7 @@
+        '--vertical-label=%(label)s' % env] + args
+ ifiles = []
+ ofiles = []
+-perf = os.path.join(os.environ['ZENHOME'], 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss')[5], 'perf')
+ rpn = env['rpn']
+ 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
+@@ -46,7 +46,7 @@
+        '--lower-limit=0',
+        '--vertical-label=%(label)s' % env] + args
+ 
+-perf = os.path.join(os.environ['ZENHOME'], 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss')[5], 'perf')
+ rpn = env['rpn']
+ 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
+@@ -38,7 +38,7 @@
+                                    '--vertical-label=%(label)s' % env]
+ ifiles = []
+ ofiles = []
+-perf = os.path.join(os.environ['ZENHOME'], 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss')[5], 'perf')
+ rpn = env['rpn']
+ 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
+@@ -44,7 +44,7 @@
+        '--vertical-label=%(label)s' % env] + args
+ ifiles = []
+ ofiles = []
+-perf = os.path.join(os.environ['ZENHOME'], 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss')[5], 'perf')
+ rpn = env['rpn']
+ 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
+@@ -42,7 +42,7 @@
+ fname = "%s/graph-%s.png" % (TMPDIR,name)
+ afiles = []
+ lfiles = []
+-perf = os.path.join(os.environ['ZENHOME'], 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss')[5], 'perf')
+ devPat = re.compile('.*(%s).*' % env.get('devices',''))
+ 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
+@@ -50,7 +50,7 @@
+     except OSError:
+         return None
+ 
+-perf = os.path.join(os.environ['ZENHOME'], 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss')[5], 'perf')
+ 
+ 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
+@@ -42,7 +42,7 @@
+ fname = "%s/graph-%s.png" % (TMPDIR,name)
+ lfiles = []
+ ufiles = []
+-perf = os.path.join(os.environ['ZENHOME'], 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss')[5], 'perf')
+ devPat = re.compile('.*(%s).*' % env.get('devices', ''))
+ for d, _, fs in os.walk(perf):
+     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
+@@ -142,7 +142,7 @@
+ baseModule = None
+ if len(sys.argv) > 1:
+     baseModule = sys.argv[1]
+-docdir = os.path.join(os.environ['ZENHOME'],"zendocs/schema")
++docdir = os.path.join(pwd.getpwnam('zenoss')[5],"zendocs/schema")
+ classList = importClasses(basemodule=baseModule, 
+             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
+@@ -37,7 +37,7 @@
+         "Run a plugin to generate the report object"
+         dmd = self.dmd
+         args = dict(zip(REQUEST.keys(), REQUEST.values()))
+-        m = os.path.join(os.environ['ZENHOME'],
++        m = os.path.join(pwd.getpwnam('zenoss')[5],
+                          'Products/ZenReports/plugins')
+         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
+@@ -60,7 +60,7 @@
+             print >>sys.stderr, ("fork #2 failed: %d (%s)" % 
+                     (e.errno, e.strerror))
+         myname = sys.argv[0].split(os.sep)[-1] + ".pid"
+-        zenhome = os.path.join(os.environ['ZENHOME'], 'var')
++        zenhome = os.path.join(pwd.getpwnam('zenoss')[5], 'var')
+         pidfile = os.path.join(zenhome, myname)
+         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
+@@ -59,7 +59,7 @@
+ 
+     def setGraphFromEdges(self, edges, directed=True):
+         import pwd, os, os.path
+-        config = os.path.join(os.environ['ZENHOME'], 'lib/graphviz/config')
++        config = os.path.join(pwd.getpwnam('zenoss')[5], 'lib/graphviz/config')
+         if not os.path.exists(config) or os.path.getsize(config) == 0:
+             os.system("$ZENHOME/bin/dot -c")
+         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
+@@ -50,7 +50,7 @@
+     def __init__(self, noopts=0, keeproot=False):
+         CmdBase.__init__(self, noopts)
+         self.keeproot=keeproot
+-        self.zenhome = os.path.join(os.environ['ZENHOME'])
++        self.zenhome = os.path.join(pwd.getpwnam('zenoss')[5])
+         self.zenvar = os.path.join(self.zenhome, "var")
+         if not noopts:
+             # These handlers do not get called if run as daemon.  In that
+@@ -78,7 +78,7 @@
+                                         self.options.logpath)
+                 logdir = self.options.logpath
+             else:
+-                logdir = os.path.join(os.environ['ZENHOME'], "log")
++                logdir = os.path.join(pwd.getpwnam('zenoss')[5], "log")
+             logfile = os.path.join(logdir, mname.lower()+".log")
+             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)
+         self.log.debug('Extracting ZenPack "%s"' % packName)
+         for name in zf.namelist():
+-            fullname = os.path.join(os.environ['ZENHOME'], 'Products', name)
++            fullname = os.path.join(pwd.getpwnam('zenoss')[5], 'Products', name)
+             self.log.debug('Extracting %s' % name)
+             if name.find('/.svn') > -1: continue
+             if name.endswith('~'): continue

Propchange: packages/zenoss/trunk/debian/patches/ZENHOME30-os.environ.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/zenoss/trunk/debian/patches/ZENHOME40-os.getent.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/ZENHOME40-os.getent.dpatch?rev=221&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/ZENHOME40-os.getent.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/ZENHOME40-os.getent.dpatch Mon Jul  9 13:40:18 2007
@@ -1,0 +1,241 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ZENHOME40-os.getent.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: cd Products; grep -lr ZENHOME * | xargs sed -i "s/os.getenv('ZENHOME')/pwd.getpwnam('zenoss')[5]/g"
+
+ at DPATCH@
+diff -urNad zenoss~/Products/ZenModel/DeviceClass.py zenoss/Products/ZenModel/DeviceClass.py
+--- zenoss~/Products/ZenModel/DeviceClass.py	2007-07-09 13:30:37.000000000 +0200
++++ zenoss/Products/ZenModel/DeviceClass.py	2007-07-09 13:31:14.000000000 +0200
+@@ -424,7 +424,7 @@
+         """Get a list of XML filenames and basenames from the ZENHOME/import
+         directory.
+         """
+-        path = os.path.join(os.getenv('ZENHOME'), 'import')
++        path = os.path.join(pwd.getpwnam('zenoss')[5], 'import')
+         filedata = []
+         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-09 13:30:37.000000000 +0200
++++ zenoss/Products/ZenModel/ZenModelRM.py	2007-07-09 13:31:14.000000000 +0200
+@@ -107,7 +107,7 @@
+         dest = 'filesystem'
+         if REQUEST:
+             dest = REQUEST.form.get('dest')
+-        zenhome = os.getenv('ZENHOME')
++        zenhome = pwd.getpwnam('zenoss')[5]
+         expDir = os.path.join(zenhome, 'export')
+         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-09 13:30:38.000000000 +0200
++++ zenoss/Products/ZenModel/ZenPack.py	2007-07-09 13:31:14.000000000 +0200
+@@ -128,7 +128,7 @@
+ ''' % (self.author, self.organization, self.version))
+ 
+             fp.close()
+-        zenhome = os.getenv('ZENHOME')
++        zenhome = pwd.getpwnam('zenoss')[5]
+         path = os.path.join(zenhome, 'export')
+         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-09 13:30:37.000000000 +0200
++++ zenoss/Products/ZenModel/ZenossInfo.py	2007-07-09 13:31:14.000000000 +0200
+@@ -179,7 +179,7 @@
+             v = Version(*getRRDToolVersion())
+             v.full()
+         """
+-        cmd = os.path.join(os.getenv('ZENHOME'), 'bin', 'rrdtool')
++        cmd = os.path.join(pwd.getpwnam('zenoss')[5], 'bin', 'rrdtool')
+         if not os.path.exists(cmd):
+             cmd = 'rrdtool'
+         fd = os.popen(cmd)
+@@ -244,7 +244,7 @@
+     
+     def getZenossRevision(self):
+         try:
+-            os.chdir(os.path.join(os.getenv('ZENHOME'), 'Products'))
++            os.chdir(os.path.join(pwd.getpwnam('zenoss')[5], 'Products'))
+             fd = os.popen("svn info 2>/dev/null | grep Revision | awk '{print $2}'")
+             return fd.readlines()[0].strip()
+         except:
+@@ -346,7 +346,7 @@
+             name = 'ZEO'
+         else:
+             name = "%s.py" % name
+-        pidFile = os.path.join(os.getenv('ZENHOME'), 'var', '%s.pid' % name)
++        pidFile = os.path.join(pwd.getpwnam('zenoss')[5], 'var', '%s.pid' % name)
+         if os.path.exists(pidFile):
+             pid = open(pidFile).read()
+             try:
+@@ -363,7 +363,7 @@
+         """
+         Get the list of supported Zenoss daemons.
+         """
+-        masterScript = os.path.join(os.getenv('ZENHOME'), 'bin', 'zenoss')
++        masterScript = os.path.join(pwd.getpwnam('zenoss')[5], 'bin', 'zenoss')
+         daemons = []
+         for line in os.popen("%s list" % masterScript).readlines():
+             daemons.append(line.strip())
+@@ -402,7 +402,7 @@
+             daemon = 'event'
+         elif daemon == 'zeoctl':
+             daemon = 'zeo'
+-        filename = os.path.join(os.getenv('ZENHOME'), 'log', "%s.log" % daemon)
++        filename = os.path.join(pwd.getpwnam('zenoss')[5], 'log', "%s.log" % daemon)
+         # if there is no data read, we don't want to return something that can
+         # be interptreted as "None", so we make the default a single white
+         # space
+@@ -419,7 +419,7 @@
+             daemon = 'zope'
+         elif daemon == 'zeoctl':
+             daemon = 'zeo'
+-        return os.path.join(os.getenv('ZENHOME'), 'etc',
++        return os.path.join(pwd.getpwnam('zenoss')[5], 'etc',
+             "%s.conf" % daemon)
+ 
+     def _readConfigFile(self, filename):
+@@ -468,7 +468,7 @@
+         action = (REQUEST.form.get('action') or '').lower()
+         if action not in legalValues:
+             return self.callZenScreen(REQUEST)
+-        daemon = os.path.join(os.getenv('ZENHOME'), 'bin',
++        daemon = os.path.join(pwd.getpwnam('zenoss')[5], 'bin',
+             REQUEST.form.get('daemon'))
+         # 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-09 13:30:37.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/about_zenoss.py	2007-07-09 13:31:14.000000000 +0200
+@@ -26,7 +26,7 @@
+ 
+ import Migrate
+ 
+-zenhome = os.getenv('ZENHOME')
++zenhome = pwd.getpwnam('zenoss')[5]
+ 
+ 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-09 13:30:37.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py	2007-07-09 13:31:14.000000000 +0200
+@@ -31,7 +31,7 @@
+         app = dmd.getPhysicalRoot()
+         if app.hasObject('standard_error_message'):
+             app._delObject('standard_error_message')
+-        zenhome = os.getenv('ZENHOME')
++        zenhome = pwd.getpwnam('zenoss')[5]
+         file = open('%s/Products/ZenModel/dtml/standard_error_message.dtml' %
+                         zenhome)
+         try:
+diff -urNad zenoss~/Products/ZenModel/migrate/datapoints.py zenoss/Products/ZenModel/migrate/datapoints.py
+--- zenoss~/Products/ZenModel/migrate/datapoints.py	2007-07-09 13:30:37.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/datapoints.py	2007-07-09 13:31:14.000000000 +0200
+@@ -71,7 +71,7 @@
+             s.datapoints._setObject(p.id, p)
+ 
+     def cutoverTemplate(self, t, rrdPath):
+-        oldbase = os.path.join(os.getenv('ZENHOME'), 'perf')
++        oldbase = os.path.join(pwd.getpwnam('zenoss')[5], 'perf')
+         for s in t.datasources()[:]:
+             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-09 13:30:37.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py	2007-07-09 13:31:14.000000000 +0200
+@@ -22,7 +22,7 @@
+         app = dmd.getPhysicalRoot()
+         if app.hasObject('standard_error_message'):
+             app._delObject('standard_error_message')
+-        zenhome = os.getenv('ZENHOME')
++        zenhome = pwd.getpwnam('zenoss')[5]
+         file = open('%s/Products/ZenModel/dtml/standard_error_message.dtml' %
+                         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-09 13:30:37.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/hoist_perf_data.py	2007-07-09 13:31:14.000000000 +0200
+@@ -36,7 +36,7 @@
+         import glob
+         names = dmd.getDmdRoot('Devices').getOrganizerNames(True)
+         
+-        oldbase = os.path.join(os.getenv('ZENHOME'), 'perf', 'Devices')
++        oldbase = os.path.join(pwd.getpwnam('zenoss')[5], 'perf', 'Devices')
+         names.sort()
+         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-09 13:30:37.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/import_export_filesystem.py	2007-07-09 13:31:14.000000000 +0200
+@@ -24,7 +24,7 @@
+ 
+ import Migrate
+ 
+-zenhome = os.getenv('ZENHOME')
++zenhome = pwd.getpwnam('zenoss')[5]
+ 
+ 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-09 13:30:37.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/standarderrormessage.py	2007-07-09 13:31:14.000000000 +0200
+@@ -32,7 +32,7 @@
+         app = dmd.getPhysicalRoot()
+         if app.hasObject('standard_error_message'):
+             app._delObject('standard_error_message')
+-        zenhome = os.getenv('ZENHOME')
++        zenhome = pwd.getpwnam('zenoss')[5]
+         file = open('%s/Products/ZenModel/dtml/standard_error_message.dtml' %
+                         zenhome)
+         try:
+diff -urNad zenoss~/Products/ZenModel/zendmd.py zenoss/Products/ZenModel/zendmd.py
+--- zenoss~/Products/ZenModel/zendmd.py	2007-07-09 13:30:37.000000000 +0200
++++ zenoss/Products/ZenModel/zendmd.py	2007-07-09 13:31:14.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
+     # the original has proven difficult to locate.
+-    zenHome = os.getenv('ZENHOME')
++    zenHome = pwd.getpwnam('zenoss')[5]
+     historyPath = os.path.join(zenHome, '.pyhistory')
+     def save_history(historyPath=historyPath):
+         import readline
+diff -urNad zenoss~/Products/ZenUtils/ZCmdBase.py zenoss/Products/ZenUtils/ZCmdBase.py
+--- zenoss~/Products/ZenUtils/ZCmdBase.py	2007-07-09 13:30:38.000000000 +0200
++++ zenoss/Products/ZenUtils/ZCmdBase.py	2007-07-09 13:31:14.000000000 +0200
+@@ -27,7 +27,7 @@
+ from ZenDaemon import ZenDaemon
+ 
+ import pwd, os
+-defaultCacheDir = os.getenv('ZENHOME')
++defaultCacheDir = pwd.getpwnam('zenoss')[5]
+ if defaultCacheDir is not None:
+     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-09 13:30:38.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenBackupBase.py	2007-07-09 13:31:14.000000000 +0200
+@@ -40,7 +40,7 @@
+ 
+     def __init__(self, noopts=0):
+         CmdBase.__init__(self, noopts)
+-        self.zenhome = os.getenv('ZENHOME')
++        self.zenhome = pwd.getpwnam('zenoss')[5]
+         self.zopehome = os.getenv('ZOPEHOME')
+ 
+ 
+diff -urNad zenoss~/Products/ZenUtils/ZenScriptBase.py zenoss/Products/ZenUtils/ZenScriptBase.py
+--- zenoss~/Products/ZenUtils/ZenScriptBase.py	2007-07-09 13:30:38.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenScriptBase.py	2007-07-09 13:31:14.000000000 +0200
+@@ -23,7 +23,7 @@
+ from Exceptions import ZentinelException
+ 
+ import pwd, os
+-defaultCacheDir = os.getenv('ZENHOME')
++defaultCacheDir = pwd.getpwnam('zenoss')[5]
+ if defaultCacheDir is not None:
+     defaultCacheDir = os.path.join(defaultCacheDir, 'var')
+ 

Propchange: packages/zenoss/trunk/debian/patches/ZENHOME40-os.getent.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/zenoss/trunk/debian/patches/ZENHOME50-zen2load.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/ZENHOME50-zen2load.dpatch?rev=221&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/ZENHOME50-zen2load.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/ZENHOME50-zen2load.dpatch Mon Jul  9 13:40:18 2007
@@ -1,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## foo.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: the only py script in bin
+
+ at 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
+@@ -21,7 +21,7 @@
+ __version__ = "$Revision: 1.3 $"[11:-2]
+ 
+ import sys
+-import os
++import pwd, os
+ import types
+ import urllib2
+ import transaction
+@@ -43,9 +43,7 @@
+ 
+ from Products.ZenRelations.Exceptions import *
+ 
+-if not os.environ.has_key('ZENHOME'):
+-    raise SysemExit("ERROR: ZENHOME envrionment variable not set")
+-zenhome = os.environ['ZENHOME']
++zenhome = pwd.getpwnam('zenoss')[5]
+ 
+ 
+ class ImportRM(CmdBase, ContentHandler):

Propchange: packages/zenoss/trunk/debian/patches/ZENHOME50-zen2load.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/zenoss/trunk/debian/patches/ZENHOME60-rm-extra-check-in-zenbuild.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/ZENHOME60-rm-extra-check-in-zenbuild.dpatch?rev=221&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/ZENHOME60-rm-extra-check-in-zenbuild.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/ZENHOME60-rm-extra-check-in-zenbuild.dpatch Mon Jul  9 13:40:18 2007
@@ -1,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## foo.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: argh... checking it twice... getting rid of it.
+
+ at 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
+@@ -25,9 +25,6 @@
+ import Globals
+ import transaction
+ 
+-if not os.environ.has_key('ZENHOME'):
+-    print "ERROR: ZENHOME envrionment variable not set"
+-    sys.exit(1)
+ 
+ zenhome = pwd.getpwnam('zenoss')[5]
+ 
+@@ -42,9 +39,6 @@
+     
+     def __init__(self):
+         CmdBase.__init__(self)
+-        if not os.environ.has_key("ZENHOME"):
+-            print "ERROR: ZENHOME not set."
+-            sys.exit(1)
+         zopeconf = os.path.join(pwd.getpwnam('zenoss')[5], "etc/zope.conf")
+         import Zope2
+         Zope2.configure(zopeconf)

Propchange: packages/zenoss/trunk/debian/patches/ZENHOME60-rm-extra-check-in-zenbuild.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/zenoss/trunk/debian/patches/ZENHOME90-rest-Products.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/ZENHOME90-rest-Products.dpatch?rev=221&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/ZENHOME90-rest-Products.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/ZENHOME90-rest-Products.dpatch Mon Jul  9 13:40:18 2007
@@ -1,0 +1,81 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ZENHOME90-rest-Products.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: getting rid of all ZENHOMEs in Products
+
+ at 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-09 14:58:37.000000000 +0200
+@@ -5,7 +5,7 @@
+     Environment
+ 
+         The Zentinel Portal run environment can be customized by modifying severel environment variables.
+-        <p>ZENHOME - must be defined path to base portal install</p>
++        <p>ZENHOME - must be defined path to base portal install. On Debian this is not needed normally.</p>
+         <p>SYBASE - path to the sybase install used to connect to netcool.  Normally this is set automatically based on ZENHOME</p>
+         <p>ORACLE_HOME - path to the oracle client install used to connect to the netcool history database.</p>
+ 
+diff -urNad zenoss~/Products/ZenRRD/plugins/randomExample.py zenoss/Products/ZenRRD/plugins/randomExample.py
+--- zenoss~/Products/ZenRRD/plugins/randomExample.py	2007-07-09 14:57:03.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/randomExample.py	2007-07-09 15:01:50.000000000 +0200
+@@ -31,7 +31,7 @@
+ 
+     env = {}
+     env.update(os.environ)
+-    anyOldFile = random.choice(glob.glob('%(ZENHOME)s/perf/Devices/*/*.rrd' % env))
++    anyOldFile = random.choice(glob.glob('%s/perf/Devices/*/*.rrd' % pwd.getpwnam('zenoss')[5]))
+     basename=os.path.basename(anyOldFile[:-4])
+     width=500
+     height=100
+diff -urNad zenoss~/Products/ZenUtils/Graphics.py zenoss/Products/ZenUtils/Graphics.py
+--- zenoss~/Products/ZenUtils/Graphics.py	2007-07-09 14:57:03.000000000 +0200
++++ zenoss/Products/ZenUtils/Graphics.py	2007-07-09 15:02:18.000000000 +0200
+@@ -61,7 +61,7 @@
+         import pwd, os, os.path
+         config = os.path.join(pwd.getpwnam('zenoss')[5], 'lib/graphviz/config')
+         if not os.path.exists(config) or os.path.getsize(config) == 0:
+-            os.system("$ZENHOME/bin/dot -c")
++            os.system("/usr/bin/dot -c")
+         import pydot
+         graph = pydot.graph_from_edges(edges, directed=directed)
+         graph.ranksep = '1.5'
+diff -urNad zenoss~/Products/ZenUtils/ZenBackup.py zenoss/Products/ZenUtils/ZenBackup.py
+--- zenoss~/Products/ZenUtils/ZenBackup.py	2007-07-09 14:57:03.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenBackup.py	2007-07-09 15:09:25.000000000 +0200
+@@ -126,7 +126,7 @@
+                                default=None,
+                                help='File to backup to.'
+                                      ' Backups will by default be placed'
+-                                     ' in $ZENHOME/backups/')
++                                     ' in %s/backups/' % pwd.getpwnam('zenoss')[5])
+         self.parser.add_option('--no-eventsdb',
+                                dest="noEventsDb",
+                                default=False,
+diff -urNad zenoss~/Products/ZenUtils/zenpack.py zenoss/Products/ZenUtils/zenpack.py
+--- zenoss~/Products/ZenUtils/zenpack.py	2007-07-09 14:57:03.000000000 +0200
++++ zenoss/Products/ZenUtils/zenpack.py	2007-07-09 15:08:37.000000000 +0200
+@@ -150,7 +150,7 @@
+         
+         # Continue without copying if the srcDir is already in Products
+         if os.path.exists(root) and os.path.samefile(root, srcDir):
+-            self.log.debug('Directory already in $ZENHOME/Products,'
++            self.log.debug('Directory already in %s/Products,' % pwd.getpwnam('zenoss')[5]
+                             ' not copying.')
+             return packName
+         
+@@ -161,10 +161,10 @@
+             
+         # Copy the source dir over to Products
+         self.log.debug('Copying %s' % packName)
+-        #result = os.system('cp -r %s $ZENHOME/Products/' % srcDir)
+-        result = os.system('rsync -rlC %s $ZENHOME/Products' % srcDir)
++        #result = os.system('cp -r %s %s/Products/' % (srcDir, pwd.getpwnam('zenoss')[5]))
++        result = os.system('rsync -rlC %s %s/Products' % (srcDir, pwd.getpwnam('zenoss')[5]))
+         if result == -1:
+-            self.stop('Error copying %s to $ZENHOME/Products' % srcDir)
++            self.stop('Error copying %s to %s/Products' % (srcDir, pwd.getpwnam('zenoss')[5]))
+         
+         return packName
+         

Propchange: packages/zenoss/trunk/debian/patches/ZENHOME90-rest-Products.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/zenoss/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/rules?rev=221&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/rules (original)
+++ packages/zenoss/trunk/debian/rules Mon Jul  9 13:40:18 2007
@@ -87,7 +87,9 @@
 	rm -f $(CURDIR)/debian/zenoss/usr/lib/zenoss/skel/import/*.zexp
 	mkdir $(CURDIR)/debian/zenoss/usr/lib/zenoss/skel/perf
 	dh_install -pzenoss -Xzope.conf.in -Xsudoers -Xmy.cnf -Xsnmpd.conf \
-		-Xfreetds.conf -XLICENSE.txt -XCOPYRIGHT.txt -Xlicense.txt
+		-Xfreetds.conf -XLICENSE.txt -XCOPYRIGHT.txt -Xlicense.txt \
+		-Xzenoss_init_post -Xzenoss_init_pre -Xzenoss_upgrade_post \
+		-Xzenoss_upgrade_pre -Xzenctl -Xzeneventbuild
 
 binary-arch: build-arch install-arch
 	dh_testdir
@@ -116,7 +118,7 @@
 	dh_installzopeinstance -pzenoss zenoss
 	dh_installman -i
 	dh_link -i
-	dh_compress -i -XZenossAdminGuide-1.1.pdf
+	dh_compress -i -XZenossAdminGuide2-0.pdf
 	dh_fixperms -i
 	dh_installdebconf -i
 	dh_installdeb -i

Modified: packages/zenoss/trunk/debian/rules-extras.mk
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/rules-extras.mk?rev=221&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/rules-extras.mk (original)
+++ packages/zenoss/trunk/debian/rules-extras.mk Mon Jul  9 13:40:18 2007
@@ -138,6 +138,7 @@
 	    rm -rf zenwin ;\
 	    rm -rf zenplugins ;\
 	    rm -rf pynetsnmp ;\
+	    rm -rf scripts ;\
 	    rmdir test || echo "----> please fix: directory test not empty anymore!" ;\
 	    rm -rf inst/externallibs ;\
 	    rm -rf zendocs/Admin_Guide_1.0_Screens ;\

Modified: packages/zenoss/trunk/debian/zenoss-doc.doc-base
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/zenoss-doc.doc-base?rev=221&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/zenoss-doc.doc-base (original)
+++ packages/zenoss/trunk/debian/zenoss-doc.doc-base Mon Jul  9 13:40:18 2007
@@ -8,4 +8,4 @@
 Section: Apps/System
 
 Format: PDF
-Files: /usr/share/doc/zenoss/ZenossAdminGuide.pdf
+Files: /usr/share/doc/zenoss/ZenossAdminGuide2-0.pdf

Modified: packages/zenoss/trunk/debian/zenoss-doc.install
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/zenoss-doc.install?rev=221&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/zenoss-doc.install (original)
+++ packages/zenoss/trunk/debian/zenoss-doc.install Mon Jul  9 13:40:18 2007
@@ -4,4 +4,4 @@
 inst/docs/ZenPackNotes.txt		usr/share/doc/zenoss
 inst/docs/ZenPack.txt			usr/share/doc/zenoss
 inst/docs/HelloWorldZenPack		usr/share/doc/zenoss
-zendocs/ZenossAdminGuide-1.1.pdf	usr/share/doc/zenoss
+zendocs/Admin\ Guide\ 2.0/ZenossAdminGuide2-0.pdf	usr/share/doc/zenoss




More information about the Pkg-zenoss-commits mailing list