[Pkg-zenoss-commits] r143 - in /packages/zenoss/trunk/debian/patches: remove-ZENHOME-os.environ.dpatch remove-ZENHOME-os.getent.dpatch
bzed-guest at users.alioth.debian.org
bzed-guest at users.alioth.debian.org
Sun Jun 17 17:29:13 UTC 2007
Author: bzed-guest
Date: Sun Jun 17 17:29:13 2007
New Revision: 143
URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=143
Log:
fix for the fix
Modified:
packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.environ.dpatch
packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.getent.dpatch
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=143&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.environ.dpatch (original)
+++ packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.environ.dpatch Sun Jun 17 17:29:13 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'),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 os, pwd/g" $i > $i.new; mv $i.new $i; done
@DPATCH@
diff -urNad zenoss~/Products/ZenEvents/zensendsyslog.py zenoss/Products/ZenEvents/zensendsyslog.py
@@ -19,7 +19,7 @@
import time
import Globals
-zhome = os.environ['ZENHOME']
-+zhome = pwd.getpwnam('zenoss')
++zhome = pwd.getpwnam('zenoss')[5]
logdir = os.path.join(zhome, "log")
defaultInfile = os.path.join(logdir, "origsyslog.log")
@@ -40,7 +40,7 @@
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'),"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)
@@ -61,7 +61,7 @@
dest='passwordfile',
type='string',
- default=os.path.join(os.environ['ZENHOME'],
-+ default=os.path.join(pwd.getpwnam('zenoss'),
++ default=os.path.join(pwd.getpwnam('zenoss')[5],
'etc','hubpasswd'))
@@ -75,7 +75,7 @@
- import os
- zp = os.path.join(os.environ['ZENHOME'], 'Products', id)
+ import os, pwd
-+ zp = os.path.join(pwd.getpwnam('zenoss'), 'Products', id)
++ zp = os.path.join(pwd.getpwnam('zenoss')[5], 'Products', id)
if not os.path.isdir(zp):
os.makedirs(zp)
for d in ['objects', 'skins', 'modeler/plugins',
@@ -87,7 +87,7 @@
- zp = os.path.join(os.environ['ZENHOME'], 'bin', 'zenpack')
- import os
+ import os, pwd
-+ zp = os.path.join(pwd.getpwnam('zenoss'), 'bin', 'zenpack')
++ zp = os.path.join(pwd.getpwnam('zenoss')[5], 'bin', 'zenpack')
+ import os, pwd
for pack in ids:
os.system('%s run --remove %s' % (zp, pack))
@@ -111,7 +111,7 @@
- import os
- zd = os.path.join(os.environ['ZENHOME'], 'bin', 'zendisc')
+ import os, pwd
-+ zd = os.path.join(pwd.getpwnam('zenoss'), '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)
@@ -132,7 +132,7 @@
from ZenDate import ZenDate
-PERF_ROOT = os.path.join(os.environ['ZENHOME'], "perf")
-+PERF_ROOT = os.path.join(pwd.getpwnam('zenoss'), "perf")
++PERF_ROOT = os.path.join(pwd.getpwnam('zenoss')[5], "perf")
def performancePath(target):
if target.startswith("/"): target = target[1:]
@@ -153,7 +153,7 @@
def zenPackPath(*parts):
- return os.path.join(os.environ['ZENHOME'], 'Products', *parts)
-+ return os.path.join(pwd.getpwnam('zenoss'), 'Products', *parts)
++ return os.path.join(pwd.getpwnam('zenoss')[5], 'Products', *parts)
class ZenPackBase(ZenPack):
@@ -174,7 +174,7 @@
def binPath(self, daemon):
- return os.path.join(os.environ['ZENHOME'],
-+ return os.path.join(pwd.getpwnam('zenoss'),
++ return os.path.join(pwd.getpwnam('zenoss')[5],
'bin',
os.path.basename(daemon))
@@ -188,7 +188,7 @@
- import os
- for p, d, fs in os.walk(os.path.join(os.environ['ZENHOME'], 'Products')):
+ import os, pwd
-+ for p, d, fs in os.walk(os.path.join(pwd.getpwnam('zenoss'), '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)
@@ -203,7 +203,7 @@
+ import os, pwd
self.update(dmd, "zNagiosPath", "zCommandPath",
- os.path.join(os.environ['ZENHOME'], 'libexec'))
-+ os.path.join(pwd.getpwnam('zenoss'), 'libexec'))
++ os.path.join(pwd.getpwnam('zenoss')[5], 'libexec'))
if dmd.Devices.hasProperty("zNagiosCycleTime"):
dmd.Devices._delProperty("zNagiosCycleTime")
zem = self.dmd.ZenEventManager
@@ -224,7 +224,7 @@
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'),
++ imp.options.infile = os.path.join(pwd.getpwnam('zenoss')[5],
'Products', 'ZenModel', 'data', 'rrdconfig.update')
imp.loadDatabase()
@@ -242,7 +242,7 @@
from Products.ZenModel.Device import Device
-zenhome = os.environ['ZENHOME']
-+zenhome = pwd.getpwnam('zenoss')
++zenhome = pwd.getpwnam('zenoss')[5]
menuxml = os.path.join(zenhome, "Products/ZenModel/data/menus.xml")
ZenPackItems = dict(
@@ -263,7 +263,7 @@
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'),
++ imp.options.infile = os.path.join(pwd.getpwnam('zenoss')[5],
'Products', 'ZenModel', 'data', 'osproc.update')
imp.loadDatabase()
@@ -280,7 +280,7 @@
+ import os, pwd.path
procs = os.path.join(
- os.environ['ZENHOME'], 'Products', 'ZenEvents', 'db', 'zenprocs.sql')
-+ pwd.getpwnam('zenoss'), '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,
@@ -301,7 +301,7 @@
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'), "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)
@@ -322,7 +322,7 @@
options = OptionsBucket()
options.configfile = os.path.join(
- os.environ['ZENHOME'], 'etc', 'zenactions.conf')
-+ pwd.getpwnam('zenoss'), 'etc', 'zenactions.conf')
++ pwd.getpwnam('zenoss')[5], 'etc', 'zenactions.conf')
parseconfig(options)
if not hasattr(dmd, 'smtpHost'):
dmd.smtpHost = getattr(options, 'smtphost', '') or 'localhost'
@@ -336,7 +336,7 @@
-import os
-for d, dirs, filenames in os.walk(os.path.join(os.environ['ZENHOME'], 'perf')):
+import os, pwd
-+for d, dirs, filenames in os.walk(os.path.join(pwd.getpwnam('zenoss'), '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
@@ -350,7 +350,7 @@
- import os
- dmd.Devices.zCommandPath = os.path.join(os.environ['ZENHOME'], 'libexec')
+ import os, pwd
-+ dmd.Devices.zCommandPath = os.path.join(pwd.getpwnam('zenoss'), '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()]
@@ -371,7 +371,7 @@
sys.exit(1)
-zenhome = os.environ['ZENHOME']
-+zenhome = pwd.getpwnam('zenoss')
++zenhome = pwd.getpwnam('zenoss')[5]
import Globals
@@ -380,7 +380,7 @@
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'), "etc/zope.conf")
++ zopeconf = os.path.join(pwd.getpwnam('zenoss')[5], "etc/zope.conf")
import Zope2
Zope2.configure(zopeconf)
self.app = Zope2.app()
@@ -401,7 +401,7 @@
def load(self):
- smimibdir = os.path.join(os.environ['ZENHOME'], 'share/mibs')
-+ smimibdir = os.path.join(pwd.getpwnam('zenoss'), '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())
@@ -422,7 +422,7 @@
try:
dmd = self.dmd
- m = os.path.join(os.environ['ZENHOME'],
-+ m = os.path.join(pwd.getpwnam('zenoss'),
++ m = os.path.join(pwd.getpwnam('zenoss')[5],
'Products/ZenRRD/plugins/%s.py' % name)
exec open(m)
return graph
@@ -443,7 +443,7 @@
cmd = [fname,] + basicArgs(env) + args
-perf = os.path.join(os.environ['ZENHOME'], 'perf')
-+perf = os.path.join(pwd.getpwnam('zenoss'), 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss')[5], 'perf')
rpn = env['rpn']
rfiles = []
devicePat = re.compile('.*(' + devices + ').*')
@@ -464,7 +464,7 @@
ifiles = []
ofiles = []
-perf = os.path.join(os.environ['ZENHOME'], 'perf')
-+perf = os.path.join(pwd.getpwnam('zenoss'), '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):
@@ -485,7 +485,7 @@
'--vertical-label=%(label)s' % env] + args
-perf = os.path.join(os.environ['ZENHOME'], 'perf')
-+perf = os.path.join(pwd.getpwnam('zenoss'), 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss')[5], 'perf')
rpn = env['rpn']
rfiles = []
for d, _, fs in os.walk(perf):
@@ -506,7 +506,7 @@
ifiles = []
ofiles = []
-perf = os.path.join(os.environ['ZENHOME'], 'perf')
-+perf = os.path.join(pwd.getpwnam('zenoss'), 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss')[5], 'perf')
rpn = env['rpn']
for d, _, fs in os.walk(perf):
for f in fs:
@@ -527,7 +527,7 @@
ifiles = []
ofiles = []
-perf = os.path.join(os.environ['ZENHOME'], 'perf')
-+perf = os.path.join(pwd.getpwnam('zenoss'), '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):
@@ -548,7 +548,7 @@
afiles = []
lfiles = []
-perf = os.path.join(os.environ['ZENHOME'], 'perf')
-+perf = os.path.join(pwd.getpwnam('zenoss'), '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
@@ -569,7 +569,7 @@
return None
-perf = os.path.join(os.environ['ZENHOME'], 'perf')
-+perf = os.path.join(pwd.getpwnam('zenoss'), 'perf')
++perf = os.path.join(pwd.getpwnam('zenoss')[5], 'perf')
title = 'Plugin Title'
label = ''
@@ -590,7 +590,7 @@
lfiles = []
ufiles = []
-perf = os.path.join(os.environ['ZENHOME'], 'perf')
-+perf = os.path.join(pwd.getpwnam('zenoss'), '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
@@ -602,7 +602,7 @@
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'),"zendocs/schema")
++docdir = os.path.join(pwd.getpwnam('zenoss')[5],"zendocs/schema")
classList = importClasses(basemodule=baseModule,
skipnames=("ZentinelPortal", "ZDeviceLoader"))
htmlGen = HtmlGenerator(baseModule, classList, docdir)
@@ -623,7 +623,7 @@
dmd = self.dmd
args = dict(zip(REQUEST.keys(), REQUEST.values()))
- m = os.path.join(os.environ['ZENHOME'],
-+ m = os.path.join(pwd.getpwnam('zenoss'),
++ m = os.path.join(pwd.getpwnam('zenoss')[5],
'Products/ZenReports/plugins')
directories = [
p.path('reports', 'plugins') for p in self.packs()
@@ -644,7 +644,7 @@
(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'), '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')
@@ -658,7 +658,7 @@
- import os, os.path
- config = os.path.join(os.environ['ZENHOME'], 'lib/graphviz/config')
+ import os, pwd, os.path
-+ config = os.path.join(pwd.getpwnam('zenoss'), '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
@@ -679,7 +679,7 @@
CmdBase.__init__(self, noopts)
self.keeproot=keeproot
- self.zenhome = os.path.join(os.environ['ZENHOME'])
-+ self.zenhome = os.path.join(pwd.getpwnam('zenoss'))
++ self.zenhome = os.path.join(pwd.getpwnam('zenoss')[5])
self.zenvar = os.path.join(self.zenhome, "var")
if not noopts:
signal.signal(signal.SIGINT, self.sigTerm)
@@ -688,7 +688,7 @@
logdir = self.options.logpath
else:
- logdir = os.path.join(os.environ['ZENHOME'], "log")
-+ logdir = os.path.join(pwd.getpwnam('zenoss'), "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(
@@ -709,7 +709,7 @@
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'), '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
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=143&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.getent.dpatch (original)
+++ packages/zenoss/trunk/debian/patches/remove-ZENHOME-os.getent.dpatch Sun Jun 17 17:29:13 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'),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 os, pwd/g" $i > $i.new; mv $i.new $i; done
@DPATCH@
diff -urNad zenoss~/Products/ZenModel/DeviceClass.py zenoss/Products/ZenModel/DeviceClass.py
@@ -22,7 +22,7 @@
directory.
"""
- path = os.path.join(os.getenv('ZENHOME'), 'import')
-+ path = os.path.join(pwd.getpwnam('zenoss'), '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)
@@ -43,7 +43,7 @@
if REQUEST:
dest = REQUEST.form.get('dest')
- zenhome = os.getenv('ZENHOME')
-+ zenhome = pwd.getpwnam('zenoss')
++ zenhome = pwd.getpwnam('zenoss')[5]
expDir = os.path.join(zenhome, 'export')
fileBase = '%s_%s.xml' % (context.getNodeName(), context.id)
if dest == 'filesystem':
@@ -64,7 +64,7 @@
fp.close()
- zenhome = os.getenv('ZENHOME')
-+ zenhome = pwd.getpwnam('zenoss')
++ zenhome = pwd.getpwnam('zenoss')[5]
path = os.path.join(zenhome, 'export')
if not os.path.isdir(path):
os.makeDirs(path)
@@ -85,7 +85,7 @@
v.full()
"""
- cmd = os.path.join(os.getenv('ZENHOME'), 'bin', 'rrdtool')
-+ cmd = os.path.join(pwd.getpwnam('zenoss'), 'bin', 'rrdtool')
++ cmd = os.path.join(pwd.getpwnam('zenoss')[5], 'bin', 'rrdtool')
if not os.path.exists(cmd):
cmd = 'rrdtool'
fd = os.popen(cmd)
@@ -94,7 +94,7 @@
def getZenossRevision(self):
try:
- os.chdir(os.path.join(os.getenv('ZENHOME'), 'Products'))
-+ os.chdir(os.path.join(pwd.getpwnam('zenoss'), '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:
@@ -103,7 +103,7 @@
else:
name = "%s.py" % name
- pidFile = os.path.join(os.getenv('ZENHOME'), 'var', '%s.pid' % name)
-+ pidFile = os.path.join(pwd.getpwnam('zenoss'), '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:
@@ -112,7 +112,7 @@
Get the list of supported Zenoss daemons.
"""
- masterScript = os.path.join(os.getenv('ZENHOME'), 'bin', 'zenoss')
-+ masterScript = os.path.join(pwd.getpwnam('zenoss'), '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())
@@ -121,7 +121,7 @@
elif daemon == 'zeoctl':
daemon = 'zeo'
- filename = os.path.join(os.getenv('ZENHOME'), 'log', "%s.log" % daemon)
-+ filename = os.path.join(pwd.getpwnam('zenoss'), '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
@@ -130,7 +130,7 @@
elif daemon == 'zeoctl':
daemon = 'zeo'
- return os.path.join(os.getenv('ZENHOME'), 'etc',
-+ return os.path.join(pwd.getpwnam('zenoss'), 'etc',
++ return os.path.join(pwd.getpwnam('zenoss')[5], 'etc',
"%s.conf" % daemon)
def _readConfigFile(self, filename):
@@ -139,7 +139,7 @@
if action not in legalValues:
return self.callZenScreen(REQUEST)
- daemon = os.path.join(os.getenv('ZENHOME'), 'bin',
-+ daemon = os.path.join(pwd.getpwnam('zenoss'), '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
@@ -158,7 +158,7 @@
import Migrate
-zenhome = os.getenv('ZENHOME')
-+zenhome = pwd.getpwnam('zenoss')
++zenhome = pwd.getpwnam('zenoss')[5]
class AboutZenoss(Migrate.Step):
version = Migrate.Version(0, 23, 0)
@@ -179,7 +179,7 @@
if app.hasObject('standard_error_message'):
app._delObject('standard_error_message')
- zenhome = os.getenv('ZENHOME')
-+ zenhome = pwd.getpwnam('zenoss')
++ zenhome = pwd.getpwnam('zenoss')[5]
file = open('%s/Products/ZenModel/dtml/standard_error_message.dtml' %
zenhome)
try:
@@ -200,7 +200,7 @@
def cutoverTemplate(self, t, rrdPath):
- oldbase = os.path.join(os.getenv('ZENHOME'), 'perf')
-+ oldbase = os.path.join(pwd.getpwnam('zenoss'), '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)
@@ -221,7 +221,7 @@
if app.hasObject('standard_error_message'):
app._delObject('standard_error_message')
- zenhome = os.getenv('ZENHOME')
-+ zenhome = pwd.getpwnam('zenoss')
++ zenhome = pwd.getpwnam('zenoss')[5]
file = open('%s/Products/ZenModel/dtml/standard_error_message.dtml' %
zenhome)
try:
@@ -242,7 +242,7 @@
names = dmd.getDmdRoot('Devices').getOrganizerNames(True)
- oldbase = os.path.join(os.getenv('ZENHOME'), 'perf', 'Devices')
-+ oldbase = os.path.join(pwd.getpwnam('zenoss'), 'perf', 'Devices')
++ oldbase = os.path.join(pwd.getpwnam('zenoss')[5], 'perf', 'Devices')
names.sort()
names.reverse()
for name in names:
@@ -259,7 +259,7 @@
import Migrate
-zenhome = os.getenv('ZENHOME')
-+zenhome = pwd.getpwnam('zenoss')
++zenhome = pwd.getpwnam('zenoss')[5]
class ImportExportFilesystem(Migrate.Step):
version = Migrate.Version(0, 23, 0)
@@ -280,7 +280,7 @@
if app.hasObject('standard_error_message'):
app._delObject('standard_error_message')
- zenhome = os.getenv('ZENHOME')
-+ zenhome = pwd.getpwnam('zenoss')
++ zenhome = pwd.getpwnam('zenoss')[5]
file = open('%s/Products/ZenModel/dtml/standard_error_message.dtml' %
zenhome)
try:
@@ -301,7 +301,7 @@
# 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')
++ zenHome = pwd.getpwnam('zenoss')[5]
historyPath = os.path.join(zenHome, '.pyhistory')
def save_history(historyPath=historyPath):
import readline
@@ -315,7 +315,7 @@
-import os
-defaultCacheDir = os.getenv('ZENHOME')
+import os, pwd
-+defaultCacheDir = pwd.getpwnam('zenoss')
++defaultCacheDir = pwd.getpwnam('zenoss')[5]
if defaultCacheDir is not None:
defaultCacheDir = os.path.join(defaultCacheDir, 'var')
@@ -338,7 +338,7 @@
def __init__(self, noopts=0):
CmdBase.__init__(self, noopts)
- self.zenhome = os.getenv('ZENHOME')
-+ self.zenhome = pwd.getpwnam('zenoss')
++ self.zenhome = pwd.getpwnam('zenoss')[5]
self.zopehome = os.getenv('ZOPEHOME')
@@ -352,7 +352,7 @@
-import os
-defaultCacheDir = os.getenv('ZENHOME')
+import os, pwd
-+defaultCacheDir = pwd.getpwnam('zenoss')
++defaultCacheDir = pwd.getpwnam('zenoss')[5]
if defaultCacheDir is not None:
defaultCacheDir = os.path.join(defaultCacheDir, 'var')
@@ -366,7 +366,7 @@
-import os
-defaultCacheDir = os.getenv('ZENHOME')
+import os, pwd
-+defaultCacheDir = pwd.getpwnam('zenoss')
++defaultCacheDir = pwd.getpwnam('zenoss')[5]
if defaultCacheDir is not None:
defaultCacheDir = os.path.join(defaultCacheDir, 'var')
@@ -383,7 +383,7 @@
import shutil
-sys.path.append(os.path.join(os.getenv('ZENHOME'), 'Products'))
-+sys.path.append(os.path.join(pwd.getpwnam('zenoss'), 'Products'))
++sys.path.append(os.path.join(pwd.getpwnam('zenoss')[5], 'Products'))
from ZenModel.version import Current
from ZenModel.version.Version import Version
from ZenModel.version.Version import createCurrentVersionModule
More information about the Pkg-zenoss-commits
mailing list