[Pkg-zenoss-commits] r147 - in /packages/zenoss/trunk/debian: patches/remove-ZENHOME-os.environ.dpatch patches/remove-ZENHOME-os.getent.dpatch zenoss.postinst zenoss.postrm
bzed-guest at users.alioth.debian.org
bzed-guest at users.alioth.debian.org
Mon Jun 18 12:24:35 UTC 2007
Author: bzed-guest
Date: Mon Jun 18 12:24:35 2007
New Revision: 147
URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=147
Log:
- new zensocket location for maintainer scripts
- fix for the patch
Modified:
packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.environ.dpatch
packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.getent.dpatch
packages/zenoss/trunk/debian/zenoss.postinst
packages/zenoss/trunk/debian/zenoss.postrm
Modified: packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.environ.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.environ.dpatch?rev=147&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.environ.dpatch (original)
+++ packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.environ.dpatch Mon Jun 18 12:24:35 2007
@@ -3,7 +3,7 @@
##
## DP: remove the ZENHOME environment variable....
## DP: grep -lr "os.environ\['ZENHOME'\]" * | sort -u | \
-## DP: while read i; do echo $i; sed "s,os.environ\['ZENHOME'\],pwd.getpwnam('zenoss')[5],g;s/import os/import os, pwd/g" $i > $i.new; mv $i.new $i; done
+## DP: while read i; do echo $i; sed "s,os.environ\['ZENHOME'\],pwd.getpwnam('zenoss')[5],g;s/import os/import pwd, os/g" $i > $i.new; mv $i.new $i; done
@DPATCH@
diff -urNad zenoss~/Products/ZenEvents/zensendsyslog.py zenoss/Products/ZenEvents/zensendsyslog.py
@@ -14,7 +14,7 @@
###########################################################################
import sys
-import os
-+import os, pwd
++import pwd, os
import socket
import time
import Globals
@@ -31,7 +31,7 @@
import time
import socket
-import os
-+import os, pwd
++import pwd, os
from twisted.internet.protocol import DatagramProtocol
from twisted.internet import reactor
@@ -52,7 +52,7 @@
from socket import getfqdn
-import os
-+import os, pwd
++import pwd, os
from twisted.cred import portal, checkers, error, credentials
@@ -100,7 +100,7 @@
__version__ = "$Revision: 1.22 $"[11:-2]
-import os
-+import os, pwd
++import pwd, os
import sys
import math
import transaction
@@ -123,7 +123,7 @@
__version__ = "$Revision: 1.30 $"[11:-2]
-import os
-+import os, pwd
++import pwd, os
import glob
import zlib
import transaction
@@ -144,7 +144,7 @@
import transaction
-import os
-+import os, pwd
++import pwd, os
__doc__="ZenPacks base definitions"
@@ -165,7 +165,7 @@
from Products.ZenUtils.Utils import getObjByPath
-import os
-+import os, pwd
++import pwd, os
import logging
log = logging.getLogger('zen.ZPLoader')
@@ -215,7 +215,7 @@
__version__ = "$Revision$"[11:-2]
-import os
-+import os, pwd
++import pwd, os
from Acquisition import aq_base
@@ -236,7 +236,7 @@
'''
import Migrate
-import os
-+import os, pwd
++import pwd, os
from Products.ZenRelations.ImportRM import ImportRM
from Products.ZenModel.DeviceClass import DeviceClass
from Products.ZenModel.Device import Device
@@ -254,7 +254,7 @@
import Migrate
-import os
-+import os, pwd
++import pwd, os
class Processes(Migrate.Step):
version = Migrate.Version(0, 22, 0)
@@ -292,7 +292,7 @@
__version__ = "$Revision$"[11:-2]
-import os
-+import os, pwd
++import pwd, os
import re
try:
@@ -313,7 +313,7 @@
'''
import Migrate
-import os.path
-+import os, pwd.path
++import pwd, os.path
def parseconfig(options):
"""parse a config file which has key value pairs delimited by white space"""
@@ -335,7 +335,7 @@
#!/usr/bin/python
-import os
-for d, dirs, filenames in os.walk(os.path.join(os.environ['ZENHOME'], 'perf')):
-+import os, pwd
++import pwd, os
+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)
@@ -362,7 +362,7 @@
import sys
-import os
-+import os, pwd
++import pwd, os
import Globals
import transaction
@@ -392,7 +392,7 @@
###########################################################################
import sys
-import os
-+import os, pwd
++import pwd, os
import glob
from sets import Set
import pprint
@@ -413,7 +413,7 @@
__version__ = "$Revision: 1.14 $"[11:-2]
-import os
-+import os, pwd
++import pwd, os
import time
import logging
import urllib
@@ -434,7 +434,7 @@
###########################################################################
-import os
-+import os, pwd
++import pwd, os
import time
import rrdtool
import random
@@ -455,7 +455,7 @@
#
###########################################################################
-import os
-+import os, pwd
++import pwd, os
import time
import re
import rrdtool
@@ -476,7 +476,7 @@
###########################################################################
-import os
-+import os, pwd
++import pwd, os
import time
import glob
import rrdtool
@@ -497,7 +497,7 @@
#
###########################################################################
-import os
-+import os, pwd
++import pwd, os
import time
import glob
import rrdtool
@@ -518,7 +518,7 @@
#
###########################################################################
-import os
-+import os, pwd
++import pwd, os
import time
import re
import rrdtool
@@ -539,7 +539,7 @@
#
###########################################################################
-import os
-+import os, pwd
++import pwd, os
import time
import glob
import rrdtool
@@ -560,7 +560,7 @@
#
###########################################################################
-import os
-+import os, pwd
++import pwd, os
import time
TMPDIR='/tmp/renderserver'
@@ -581,7 +581,7 @@
#
###########################################################################
-import os
-+import os, pwd
++import pwd, os
import time
import glob
import rrdtool
@@ -614,7 +614,7 @@
from Products.ZenUtils.Utils import importClass
-import os
-+import os, pwd
++import pwd, os
import sys
class ReportServer(ZenModelRM):
@@ -635,7 +635,7 @@
import signal
-import os
-+import os, pwd
++import pwd, os
import sys
import socket
import time
@@ -670,7 +670,7 @@
import sys
-import os
-+import os, pwd
++import pwd, os
import pwd
import signal
import logging
@@ -700,7 +700,7 @@
import transaction
-import os, sys
-+import os, pwd, sys
++import pwd, os, sys
class ZenPackCmd(ZenScriptBase):
"Manage ZenPacks"
Modified: packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.getent.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.getent.dpatch?rev=147&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.getent.dpatch (original)
+++ packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.getent.dpatch Mon Jun 18 12:24:35 2007
@@ -2,7 +2,7 @@
## remove-ZENHOME-rest.dpatch by <bernd at bzed.de>
##
## DP more zenhome stuff removed
-## DP: grep -lr "os.getenv('ZENHOME')" * | sort -u | while read i; do echo $i; sed "s,os.getenv('ZENHOME'),pwd.getpwnam('zenoss')[5],g;s/import os/import os, pwd/g" $i > $i.new; mv $i.new $i; done
+## DP: grep -lr "os.getenv('ZENHOME')" * | sort -u | while read i; do echo $i; sed "s,os.getenv('ZENHOME'),pwd.getpwnam('zenoss')[5],g;s/import os/import pwd, os/g" $i > $i.new; mv $i.new $i; done
@DPATCH@
diff -urNad zenoss~/Products/ZenModel/DeviceClass.py zenoss/Products/ZenModel/DeviceClass.py
@@ -13,7 +13,7 @@
__version__ = "$Revision: 1.76 $"[11:-2]
-import os
-+import os, pwd
++import pwd, os
import types
import time
import urllib
@@ -34,7 +34,7 @@
__version__ = "$Revision: 1.50 $"[11:-2]
-import os
-+import os, pwd
++import pwd, os
import time
from DateTime import DateTime
@@ -55,7 +55,7 @@
import transaction
-import os, pwd
-+import os, pwd, pwd
++import pwd, os, pwd
__doc__="ZenPacks base definitions"
@@ -76,7 +76,7 @@
###########################################################################
-import os
-+import os, pwd
++import pwd, os
import re
import time
import logging
@@ -151,7 +151,7 @@
__version__ = "$Revision$"[11:-2]
-import os
-+import os, pwd
++import pwd, os
from Products.ZenModel.ZenossInfo import manage_addZenossInfo
@@ -170,7 +170,7 @@
import Migrate
-import os
-+import os, pwd
++import pwd, os
class BetterStandardErrorMessage(Migrate.Step):
version = Migrate.Version(1, 1, 0)
@@ -191,7 +191,7 @@
__version__ = "$Revision$"[11:-2]
-import os
-+import os, pwd
++import pwd, os
import sys
import Migrate
@@ -212,7 +212,7 @@
import Migrate
-import os
-+import os, pwd
++import pwd, os
class EvenBetterStandardErrorMessage(Migrate.Step):
version = Migrate.Version(2, 0, 0)
@@ -233,7 +233,7 @@
import Migrate
-import os
-+import os, pwd
++import pwd, os
class HoistPerfData(Migrate.Step):
version = Migrate.Version(0, 21, 0)
@@ -254,7 +254,7 @@
__version__ = "$Revision$"[11:-2]
-import os
-+import os, pwd
++import pwd, os
import Migrate
@@ -271,7 +271,7 @@
import Migrate
-import os
-+import os, pwd
++import pwd, os
class StandardErrorMessage(Migrate.Step):
version = Migrate.Version(0, 23, 0)
@@ -292,7 +292,7 @@
###########################################################################
-import os
-+import os, pwd
++import pwd, os
import atexit
import socket
try:
@@ -314,7 +314,7 @@
-import os
-defaultCacheDir = os.getenv('ZENHOME')
-+import os, pwd
++import pwd, os
+defaultCacheDir = pwd.getpwnam('zenoss')[5]
if defaultCacheDir is not None:
defaultCacheDir = os.path.join(defaultCacheDir, 'var')
@@ -328,8 +328,8 @@
-import os
-import os.path
-+import os, pwd
-+import os, pwd.path
++import pwd, os
++import pwd, os.path
import tempfile
from CmdBase import CmdBase
@@ -351,7 +351,7 @@
-import os
-defaultCacheDir = os.getenv('ZENHOME')
-+import os, pwd
++import pwd, os
+defaultCacheDir = pwd.getpwnam('zenoss')[5]
if defaultCacheDir is not None:
defaultCacheDir = os.path.join(defaultCacheDir, 'var')
@@ -365,7 +365,7 @@
-import os
-defaultCacheDir = os.getenv('ZENHOME')
-+import os, pwd
++import pwd, os
+defaultCacheDir = pwd.getpwnam('zenoss')[5]
if defaultCacheDir is not None:
defaultCacheDir = os.path.join(defaultCacheDir, 'var')
@@ -378,7 +378,7 @@
#
#################################################################
-import os
-+import os, pwd
++import pwd, os
import sys
import shutil
Modified: packages/zenoss/trunk/debian/zenoss.postinst
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/zenoss.postinst?rev=147&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/zenoss.postinst (original)
+++ packages/zenoss/trunk/debian/zenoss.postinst Mon Jun 18 12:24:35 2007
@@ -20,8 +20,8 @@
ln -s /var/lib/zope$ZOPE_VERSION/instance/zenoss $(getent passwd $ZENUSER | cut -d : -f 6)
fi
-if ! dpkg-statoverride --list /usr/bin/zensocket > /dev/null ; then
- dpkg-statoverride --update --add root zenoss 4754 /usr/bin/zensocket
+if ! dpkg-statoverride --list /usr/lib/zenoss/bin/zensocket > /dev/null ; then
+ dpkg-statoverride --update --add root zenoss 4754 /usr/lib/zenoss/bin/zensocket
fi
dbc_go zenoss $@
Modified: packages/zenoss/trunk/debian/zenoss.postrm
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/zenoss.postrm?rev=147&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/zenoss.postrm (original)
+++ packages/zenoss/trunk/debian/zenoss.postrm Mon Jun 18 12:24:35 2007
@@ -10,8 +10,8 @@
dbc_go zenoss $@
fi
-if dpkg-statoverride --list /usr/bin/zensocket > /dev/null ; then
- dpkg-statoverride --remove /usr/bin/zensocket
+if dpkg-statoverride --list /usr/lib/zenoss/bin/zensocket > /dev/null ; then
+ dpkg-statoverride --remove /usr/lib/zenoss/bin/zensocket
fi
if [ "$1" = "purge" ] ; then
More information about the Pkg-zenoss-commits
mailing list