[Pkg-zenoss-commits] r135 - in /packages/zenoss/trunk/debian: patches/00list patches/remove-PYTHON.dpatch zenoss.postinst
bzed-guest at users.alioth.debian.org
bzed-guest at users.alioth.debian.org
Sun Jun 17 16:19:21 UTC 2007
Author: bzed-guest
Date: Sun Jun 17 16:19:20 2007
New Revision: 135
URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=135
Log:
stupid environment stuff
Added:
packages/zenoss/trunk/debian/patches/remove-PYTHON.dpatch (with props)
Modified:
packages/zenoss/trunk/debian/patches/00list
packages/zenoss/trunk/debian/zenoss.postinst
Modified: packages/zenoss/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/00list?rev=135&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/patches/00list (original)
+++ packages/zenoss/trunk/debian/patches/00list Sun Jun 17 16:19:20 2007
@@ -4,3 +4,4 @@
remove-ZENHOME-shellscripts
remove-ZENHOME-os.getent
remove-ZENHOME-rest
+remove-PYTHON
Added: packages/zenoss/trunk/debian/patches/remove-PYTHON.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/remove-PYTHON.dpatch?rev=135&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/remove-PYTHON.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/remove-PYTHON.dpatch Sun Jun 17 16:19:20 2007
@@ -1,0 +1,180 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove-PYTHON.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: remove the need for $PYTHOn in the environment
+## DP: grep -l PYTHON bin/* | while read i; do sed -i 's,\$PYTHON,/usr/bin/python2.4,g' $i; done
+
+ at DPATCH@
+diff -urNad zenoss~/bin/fsrecover zenoss/bin/fsrecover
+--- zenoss~/bin/fsrecover 2007-06-17 17:15:39.000000000 +0100
++++ zenoss/bin/fsrecover 2007-06-17 17:16:39.000000000 +0100
+@@ -17,5 +17,5 @@
+
+ PIDFILE=$VARDIR/ZEO_SERVER.pid
+
+-$PYTHON $PRGHOME/$PRGNAME $@
++/usr/bin/python2.4 $PRGHOME/$PRGNAME $@
+ exit $?
+diff -urNad zenoss~/bin/zenbackup zenoss/bin/zenbackup
+--- zenoss~/bin/zenbackup 2007-06-17 17:15:39.000000000 +0100
++++ zenoss/bin/zenbackup 2007-06-17 17:16:39.000000000 +0100
+@@ -11,4 +11,4 @@
+ #############################################################################
+
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+-$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenUtils/ZenBackup.py "$CMD" $*
++/usr/bin/python2.4 $(getent passwd zenoss | cut -d : -f 6)/Products/ZenUtils/ZenBackup.py "$CMD" $*
+diff -urNad zenoss~/bin/zenbatchload zenoss/bin/zenbatchload
+--- zenoss~/bin/zenbatchload 2007-06-17 17:15:39.000000000 +0100
++++ zenoss/bin/zenbatchload 2007-06-17 17:16:39.000000000 +0100
+@@ -11,4 +11,4 @@
+ #############################################################################
+
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+-$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenModel/BatchDeviceLoader.py "$CMD" $*
++/usr/bin/python2.4 $(getent passwd zenoss | cut -d : -f 6)/Products/ZenModel/BatchDeviceLoader.py "$CMD" $*
+diff -urNad zenoss~/bin/zenbuild zenoss/bin/zenbuild
+--- zenoss~/bin/zenbuild 2007-06-17 17:15:39.000000000 +0100
++++ zenoss/bin/zenbuild 2007-06-17 17:16:39.000000000 +0100
+@@ -12,5 +12,5 @@
+
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+
+-$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenModel/zenbuild.py "$CMD" "$@"
++/usr/bin/python2.4 $(getent passwd zenoss | cut -d : -f 6)/Products/ZenModel/zenbuild.py "$CMD" "$@"
+
+diff -urNad zenoss~/bin/zenchkrels zenoss/bin/zenchkrels
+--- zenoss~/bin/zenchkrels 2007-06-17 17:15:39.000000000 +0100
++++ zenoss/bin/zenchkrels 2007-06-17 17:16:39.000000000 +0100
+@@ -10,4 +10,4 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+-$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenUtils/CheckRelations.py "$CMD" $*
++/usr/bin/python2.4 $(getent passwd zenoss | cut -d : -f 6)/Products/ZenUtils/CheckRelations.py "$CMD" $*
+diff -urNad zenoss~/bin/zenchkschema zenoss/bin/zenchkschema
+--- zenoss~/bin/zenchkschema 2007-06-17 17:15:39.000000000 +0100
++++ zenoss/bin/zenchkschema 2007-06-17 17:16:39.000000000 +0100
+@@ -10,4 +10,4 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+-$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/checkrel.py $*
++/usr/bin/python2.4 $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/checkrel.py $*
+diff -urNad zenoss~/bin/zendevicedump zenoss/bin/zendevicedump
+--- zenoss~/bin/zendevicedump 2007-06-17 17:15:39.000000000 +0100
++++ zenoss/bin/zendevicedump 2007-06-17 17:16:39.000000000 +0100
+@@ -10,4 +10,4 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+-$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/ExportDevices.py "$CMD" $*
++/usr/bin/python2.4 $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/ExportDevices.py "$CMD" $*
+diff -urNad zenoss~/bin/zendeviceload zenoss/bin/zendeviceload
+--- zenoss~/bin/zendeviceload 2007-06-17 17:15:39.000000000 +0100
++++ zenoss/bin/zendeviceload 2007-06-17 17:16:39.000000000 +0100
+@@ -10,4 +10,4 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+-$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/ImportDevices.py "$CMD" $*
++/usr/bin/python2.4 $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/ImportDevices.py "$CMD" $*
+diff -urNad zenoss~/bin/zendmd zenoss/bin/zendmd
+--- zenoss~/bin/zendmd 2007-06-17 17:15:39.000000000 +0100
++++ zenoss/bin/zendmd 2007-06-17 17:16:39.000000000 +0100
+@@ -13,4 +13,4 @@
+ # For some reason the zenfunctions line eats part of $*. Store
+ # value now to use in call to zendmd.py
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+-$PYTHON -i $(getent passwd zenoss | cut -d : -f 6)/Products/ZenModel/zendmd.py "$CMD" $*
++/usr/bin/python2.4 -i $(getent passwd zenoss | cut -d : -f 6)/Products/ZenModel/zendmd.py "$CMD" $*
+diff -urNad zenoss~/bin/zendump zenoss/bin/zendump
+--- zenoss~/bin/zendump 2007-06-17 17:15:39.000000000 +0100
++++ zenoss/bin/zendump 2007-06-17 17:16:39.000000000 +0100
+@@ -10,4 +10,4 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+-$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/ExportRM.py "$CMD" $*
++/usr/bin/python2.4 $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/ExportRM.py "$CMD" $*
+diff -urNad zenoss~/bin/zenfunctions zenoss/bin/zenfunctions
+--- zenoss~/bin/zenfunctions 2007-06-17 17:15:39.000000000 +0100
++++ zenoss/bin/zenfunctions 2007-06-17 17:16:39.000000000 +0100
+@@ -56,9 +56,9 @@
+ else
+ echo starting...
+ if [ "$CFGFILE" = "" ]; then
+- eval exec $SUDO $PYTHON $PRGHOME/$PRGNAME --cycle --daemon '"$@"'
++ eval exec $SUDO /usr/bin/python2.4 $PRGHOME/$PRGNAME --cycle --daemon '"$@"'
+ else
+- eval exec $SUDO $PYTHON $PRGHOME/$PRGNAME --configfile $CFGFILE \
++ eval exec $SUDO /usr/bin/python2.4 $PRGHOME/$PRGNAME --configfile $CFGFILE \
+ --cycle --daemon '"$@"'
+ fi
+ fi
+@@ -66,9 +66,9 @@
+
+ run() {
+ if [ "$CFGFILE" = "" ]; then
+- eval exec $SUDO $PYTHON $PRGHOME/$PRGNAME '"$@"'
++ eval exec $SUDO /usr/bin/python2.4 $PRGHOME/$PRGNAME '"$@"'
+ else
+- eval exec $SUDO $PYTHON $PRGHOME/$PRGNAME --configfile $CFGFILE '"$@"'
++ eval exec $SUDO /usr/bin/python2.4 $PRGHOME/$PRGNAME --configfile $CFGFILE '"$@"'
+ fi
+ }
+
+@@ -108,7 +108,7 @@
+ }
+
+ help() {
+- exec $PYTHON $PRGHOME/$PRGNAME -h
++ exec /usr/bin/python2.4 $PRGHOME/$PRGNAME -h
+ }
+
+ generic() {
+diff -urNad zenoss~/bin/zenload zenoss/bin/zenload
+--- zenoss~/bin/zenload 2007-06-17 17:15:39.000000000 +0100
++++ zenoss/bin/zenload 2007-06-17 17:16:39.000000000 +0100
+@@ -10,4 +10,4 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+-$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/ImportRM.py "$CMD" $*
++/usr/bin/python2.4 $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/ImportRM.py "$CMD" $*
+diff -urNad zenoss~/bin/zenmigrate zenoss/bin/zenmigrate
+--- zenoss~/bin/zenmigrate 2007-06-17 17:15:39.000000000 +0100
++++ zenoss/bin/zenmigrate 2007-06-17 17:16:39.000000000 +0100
+@@ -13,4 +13,4 @@
+ # For some reason the zenfunctions line eats part of $*. Store
+ # value now to use in call to zendmd.py
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+-$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenModel/migrate/zenmigrate.py "$CMD" $*
++/usr/bin/python2.4 $(getent passwd zenoss | cut -d : -f 6)/Products/ZenModel/migrate/zenmigrate.py "$CMD" $*
+diff -urNad zenoss~/bin/zenpack zenoss/bin/zenpack
+--- zenoss~/bin/zenpack 2007-06-17 17:15:39.000000000 +0100
++++ zenoss/bin/zenpack 2007-06-17 17:16:39.000000000 +0100
+@@ -11,4 +11,4 @@
+ #############################################################################
+
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+-$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenUtils/zenpack.py "$CMD" $*
++/usr/bin/python2.4 $(getent passwd zenoss | cut -d : -f 6)/Products/ZenUtils/zenpack.py "$CMD" $*
+diff -urNad zenoss~/bin/zenrestore zenoss/bin/zenrestore
+--- zenoss~/bin/zenrestore 2007-06-17 17:15:39.000000000 +0100
++++ zenoss/bin/zenrestore 2007-06-17 17:16:39.000000000 +0100
+@@ -11,4 +11,4 @@
+ #############################################################################
+
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+-$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenUtils/ZenRestore.py "$CMD" $*
++/usr/bin/python2.4 $(getent passwd zenoss | cut -d : -f 6)/Products/ZenUtils/ZenRestore.py "$CMD" $*
+diff -urNad zenoss~/bin/zenschamadoc zenoss/bin/zenschamadoc
+--- zenoss~/bin/zenschamadoc 2007-06-17 17:15:39.000000000 +0100
++++ zenoss/bin/zenschamadoc 2007-06-17 17:16:39.000000000 +0100
+@@ -10,4 +10,4 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+-$PYTHON $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/schemadoc.py Products.ZenModel
++/usr/bin/python2.4 $(getent passwd zenoss | cut -d : -f 6)/Products/ZenRelations/schemadoc.py Products.ZenModel
Propchange: packages/zenoss/trunk/debian/patches/remove-PYTHON.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/zenoss/trunk/debian/zenoss.postinst
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/zenoss.postinst?rev=135&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/zenoss.postinst (original)
+++ packages/zenoss/trunk/debian/zenoss.postinst Sun Jun 17 16:19:20 2007
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
set -e
ZENUSER=zenoss
@@ -28,6 +28,8 @@
#DEBHELPER#
+db_stop || true
+
if [ "$1" = "configure" ]; then
if [ -z "$2" ]; then
. /etc/dbconfig-common/zenoss.conf
@@ -40,6 +42,5 @@
fi
fi
-db_stop || true
exit 0
More information about the Pkg-zenoss-commits
mailing list