[Pkg-zenoss-commits] r293 - in /trunk/packages/zenoss/debian/patches: ZENHOME20-import-os.dpatch ZENHOME30-os.environ.dpatch ZENHOME40-os.getent.dpatch
bzed-guest at users.alioth.debian.org
bzed-guest at users.alioth.debian.org
Wed Sep 19 20:30:36 UTC 2007
Author: bzed-guest
Date: Wed Sep 19 20:30:36 2007
New Revision: 293
URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=293
Log:
updated patches
Modified:
trunk/packages/zenoss/debian/patches/ZENHOME20-import-os.dpatch
trunk/packages/zenoss/debian/patches/ZENHOME30-os.environ.dpatch
trunk/packages/zenoss/debian/patches/ZENHOME40-os.getent.dpatch
Modified: trunk/packages/zenoss/debian/patches/ZENHOME20-import-os.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME20-import-os.dpatch?rev=293&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME20-import-os.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME20-import-os.dpatch Wed Sep 19 20:30:36 2007
@@ -8,7 +8,7 @@
@DPATCH@
diff -urNad zenoss~/Products/ZenEvents/zensendsyslog.py zenoss/Products/ZenEvents/zensendsyslog.py
--- zenoss~/Products/ZenEvents/zensendsyslog.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenEvents/zensendsyslog.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenEvents/zensendsyslog.py 2007-09-19 22:27:40.000000000 +0200
@@ -11,7 +11,7 @@
#
###########################################################################
@@ -20,7 +20,7 @@
import Globals
diff -urNad zenoss~/Products/ZenEvents/zensyslog.py zenoss/Products/ZenEvents/zensyslog.py
--- zenoss~/Products/ZenEvents/zensyslog.py 2007-08-16 15:45:57.000000000 +0200
-+++ zenoss/Products/ZenEvents/zensyslog.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenEvents/zensyslog.py 2007-09-19 22:27:40.000000000 +0200
@@ -21,7 +21,7 @@
import time
@@ -31,8 +31,8 @@
from twisted.internet.protocol import DatagramProtocol
from twisted.internet import reactor
diff -urNad zenoss~/Products/ZenHub/zenhub.py zenoss/Products/ZenHub/zenhub.py
---- zenoss~/Products/ZenHub/zenhub.py 2007-08-17 14:44:48.000000000 +0200
-+++ zenoss/Products/ZenHub/zenhub.py 2007-09-07 00:25:41.000000000 +0200
+--- zenoss~/Products/ZenHub/zenhub.py 2007-09-10 18:13:19.000000000 +0200
++++ zenoss/Products/ZenHub/zenhub.py 2007-09-19 22:27:40.000000000 +0200
@@ -22,7 +22,7 @@
__version__ = "$Revision$"[11:-2]
@@ -43,8 +43,8 @@
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-09-07 00:23:39.000000000 +0200
-+++ zenoss/Products/ZenModel/DataRoot.py 2007-09-07 00:25:41.000000000 +0200
+--- zenoss~/Products/ZenModel/DataRoot.py 2007-09-19 22:27:05.000000000 +0200
++++ zenoss/Products/ZenModel/DataRoot.py 2007-09-19 22:27:40.000000000 +0200
@@ -467,7 +467,7 @@
pack.organization = organization
pack.version = version
@@ -67,8 +67,8 @@
os.system('%s run --remove %s' % (zp, pack))
self._p_jar.sync()
diff -urNad zenoss~/Products/ZenModel/Device.py zenoss/Products/ZenModel/Device.py
---- zenoss~/Products/ZenModel/Device.py 2007-09-06 18:19:57.000000000 +0200
-+++ zenoss/Products/ZenModel/Device.py 2007-09-07 00:25:41.000000000 +0200
+--- zenoss~/Products/ZenModel/Device.py 2007-09-19 02:03:45.000000000 +0200
++++ zenoss/Products/ZenModel/Device.py 2007-09-19 22:27:40.000000000 +0200
@@ -21,7 +21,7 @@
__version__ = "$Revision: 1.121 $"[11:-2]
@@ -79,8 +79,8 @@
import re
import time
diff -urNad zenoss~/Products/ZenModel/DeviceClass.py zenoss/Products/ZenModel/DeviceClass.py
---- zenoss~/Products/ZenModel/DeviceClass.py 2007-08-30 04:22:56.000000000 +0200
-+++ zenoss/Products/ZenModel/DeviceClass.py 2007-09-07 00:25:41.000000000 +0200
+--- zenoss~/Products/ZenModel/DeviceClass.py 2007-09-19 16:34:42.000000000 +0200
++++ zenoss/Products/ZenModel/DeviceClass.py 2007-09-19 22:27:40.000000000 +0200
@@ -17,7 +17,7 @@
__version__ = "$Revision: 1.76 $"[11:-2]
@@ -91,8 +91,8 @@
import time
import urllib
diff -urNad zenoss~/Products/ZenModel/IpNetwork.py zenoss/Products/ZenModel/IpNetwork.py
---- zenoss~/Products/ZenModel/IpNetwork.py 2007-08-31 21:33:14.000000000 +0200
-+++ zenoss/Products/ZenModel/IpNetwork.py 2007-09-07 00:25:41.000000000 +0200
+--- zenoss~/Products/ZenModel/IpNetwork.py 2007-09-17 16:29:46.000000000 +0200
++++ zenoss/Products/ZenModel/IpNetwork.py 2007-09-19 22:27:40.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision: 1.22 $"[11:-2]
@@ -102,18 +102,18 @@
import sys
import math
import transaction
-@@ -437,7 +437,7 @@
+@@ -445,7 +445,7 @@
for organizerName in organizerPaths:
try:
- organizer = orgroot.getOrganizer(organizerName)
+ organizer = orgroot._getNet(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)
+ zendiscCmd = [zd, "run", '--net', organizer.id]
+ log.info('Executing command: %s' % ' '.join(zendiscCmd))
diff -urNad zenoss~/Products/ZenModel/PerformanceConf.py zenoss/Products/ZenModel/PerformanceConf.py
---- zenoss~/Products/ZenModel/PerformanceConf.py 2007-08-28 13:24:50.000000000 +0200
-+++ zenoss/Products/ZenModel/PerformanceConf.py 2007-09-07 00:25:41.000000000 +0200
+--- zenoss~/Products/ZenModel/PerformanceConf.py 2007-09-13 21:56:44.000000000 +0200
++++ zenoss/Products/ZenModel/PerformanceConf.py 2007-09-19 22:27:40.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision: 1.30 $"[11:-2]
@@ -124,8 +124,8 @@
import transaction
import logging
diff -urNad zenoss~/Products/ZenModel/ZenModelRM.py zenoss/Products/ZenModel/ZenModelRM.py
---- zenoss~/Products/ZenModel/ZenModelRM.py 2007-08-15 20:40:59.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenModelRM.py 2007-09-07 00:25:41.000000000 +0200
+--- zenoss~/Products/ZenModel/ZenModelRM.py 2007-09-11 17:12:55.000000000 +0200
++++ zenoss/Products/ZenModel/ZenModelRM.py 2007-09-19 22:27:40.000000000 +0200
@@ -17,7 +17,7 @@
__version__ = "$Revision: 1.50 $"[11:-2]
@@ -137,7 +137,7 @@
from DateTime import DateTime
diff -urNad zenoss~/Products/ZenModel/ZenPack.py zenoss/Products/ZenModel/ZenPack.py
--- zenoss~/Products/ZenModel/ZenPack.py 2007-09-05 22:26:28.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenPack.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/ZenPack.py 2007-09-19 22:27:40.000000000 +0200
@@ -24,7 +24,7 @@
import transaction
@@ -149,7 +149,7 @@
diff -urNad zenoss~/Products/ZenModel/ZenPackLoader.py zenoss/Products/ZenModel/ZenPackLoader.py
--- zenoss~/Products/ZenModel/ZenPackLoader.py 2007-08-29 20:26:56.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenPackLoader.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/ZenPackLoader.py 2007-09-19 22:27:40.000000000 +0200
@@ -17,7 +17,7 @@
from Products.ZenReports.ReportLoader import ReportLoader
from Products.ZenUtils.Utils import getObjByPath
@@ -161,7 +161,7 @@
log = logging.getLogger('zen.ZPLoader')
diff -urNad zenoss~/Products/ZenModel/ZenossInfo.py zenoss/Products/ZenModel/ZenossInfo.py
--- zenoss~/Products/ZenModel/ZenossInfo.py 2007-05-18 22:25:16.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenossInfo.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/ZenossInfo.py 2007-09-19 22:27:40.000000000 +0200
@@ -11,7 +11,7 @@
#
###########################################################################
@@ -172,20 +172,20 @@
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-09-07 00:25:41.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/Migrate.py 2007-09-10 18:18:15.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/Migrate.py 2007-09-19 22:27:40.000000000 +0200
@@ -41,7 +41,7 @@
def cleanup():
"recursively remove all files ending with .pyc"
- import os
+ import pwd, os
+ count = 0
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-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/about_zenoss.py 2007-09-19 22:27:40.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision$"[11:-2]
@@ -197,7 +197,7 @@
diff -urNad zenoss~/Products/ZenModel/migrate/betterstandarderrormessage.py zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py
--- zenoss~/Products/ZenModel/migrate/betterstandarderrormessage.py 2007-06-05 15:19:35.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py 2007-09-19 22:27:40.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision$"[11:-2]
@@ -209,7 +209,7 @@
version = Migrate.Version(1, 1, 0)
diff -urNad zenoss~/Products/ZenModel/migrate/command.py zenoss/Products/ZenModel/migrate/command.py
--- zenoss~/Products/ZenModel/migrate/command.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/command.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/command.py 2007-09-19 22:27:40.000000000 +0200
@@ -29,7 +29,7 @@
dmd.Devices._setProperty(name, default, **kw)
@@ -221,7 +221,7 @@
if dmd.Devices.hasProperty("zNagiosCycleTime"):
diff -urNad zenoss~/Products/ZenModel/migrate/datapoints.py zenoss/Products/ZenModel/migrate/datapoints.py
--- zenoss~/Products/ZenModel/migrate/datapoints.py 2007-07-10 17:58:45.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/datapoints.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/datapoints.py 2007-09-19 22:27:40.000000000 +0200
@@ -19,7 +19,7 @@
__version__ = "$Revision$"[11:-2]
@@ -233,7 +233,7 @@
diff -urNad zenoss~/Products/ZenModel/migrate/evenbetterstandarderrormessage.py zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py
--- zenoss~/Products/ZenModel/migrate/evenbetterstandarderrormessage.py 2007-06-05 15:19:35.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py 2007-09-19 22:27:40.000000000 +0200
@@ -11,7 +11,7 @@
'''
@@ -245,7 +245,7 @@
version = Migrate.Version(2, 0, 0)
diff -urNad zenoss~/Products/ZenModel/migrate/hoist_perf_data.py zenoss/Products/ZenModel/migrate/hoist_perf_data.py
--- zenoss~/Products/ZenModel/migrate/hoist_perf_data.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/hoist_perf_data.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/hoist_perf_data.py 2007-09-19 22:27:40.000000000 +0200
@@ -23,7 +23,7 @@
import Migrate
@@ -257,7 +257,7 @@
version = Migrate.Version(0, 21, 0)
diff -urNad zenoss~/Products/ZenModel/migrate/import_export_filesystem.py zenoss/Products/ZenModel/migrate/import_export_filesystem.py
--- zenoss~/Products/ZenModel/migrate/import_export_filesystem.py 2007-07-05 22:09:00.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/import_export_filesystem.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/import_export_filesystem.py 2007-09-19 22:27:40.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision$"[11:-2]
@@ -269,7 +269,7 @@
diff -urNad zenoss~/Products/ZenModel/migrate/kill_cricket.py zenoss/Products/ZenModel/migrate/kill_cricket.py
--- zenoss~/Products/ZenModel/migrate/kill_cricket.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/kill_cricket.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/kill_cricket.py 2007-09-19 22:27:40.000000000 +0200
@@ -21,7 +21,7 @@
__version__ = "$Revision$"[11:-2]
@@ -280,8 +280,8 @@
from Acquisition import aq_base
diff -urNad zenoss~/Products/ZenModel/migrate/menus.py zenoss/Products/ZenModel/migrate/menus.py
---- zenoss~/Products/ZenModel/migrate/menus.py 2007-09-06 14:21:33.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/menus.py 2007-09-07 00:25:41.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/menus.py 2007-09-08 00:07:21.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/menus.py 2007-09-19 22:27:40.000000000 +0200
@@ -19,7 +19,7 @@
$Id:$
'''
@@ -293,7 +293,7 @@
from Products.ZenModel.Device import Device
diff -urNad zenoss~/Products/ZenModel/migrate/processes.py zenoss/Products/ZenModel/migrate/processes.py
--- zenoss~/Products/ZenModel/migrate/processes.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/processes.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/processes.py 2007-09-19 22:27:40.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision$"[11:-2]
@@ -305,7 +305,7 @@
version = Migrate.Version(0, 22, 0)
diff -urNad zenoss~/Products/ZenModel/migrate/procparams.py zenoss/Products/ZenModel/migrate/procparams.py
--- zenoss~/Products/ZenModel/migrate/procparams.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/procparams.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/procparams.py 2007-09-19 22:27:40.000000000 +0200
@@ -21,8 +21,8 @@
version = Migrate.Version(1, 1, 0)
@@ -319,7 +319,7 @@
os.system('cat %s | mysql -u%s -p%s %s' % (
diff -urNad zenoss~/Products/ZenModel/migrate/rrdmin.py zenoss/Products/ZenModel/migrate/rrdmin.py
--- zenoss~/Products/ZenModel/migrate/rrdmin.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/rrdmin.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/rrdmin.py 2007-09-19 22:27:40.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision$"[11:-2]
@@ -331,7 +331,7 @@
try:
diff -urNad zenoss~/Products/ZenModel/migrate/smtpsnpp.py zenoss/Products/ZenModel/migrate/smtpsnpp.py
--- zenoss~/Products/ZenModel/migrate/smtpsnpp.py 2007-06-05 15:19:35.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/smtpsnpp.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/smtpsnpp.py 2007-09-19 22:27:40.000000000 +0200
@@ -17,7 +17,7 @@
'''
@@ -343,7 +343,7 @@
"""parse a config file which has key value pairs delimited by white space"""
diff -urNad zenoss~/Products/ZenModel/migrate/standalone_datapoint_rename.py zenoss/Products/ZenModel/migrate/standalone_datapoint_rename.py
--- zenoss~/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-06-05 15:19:35.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-09-19 22:27:40.000000000 +0200
@@ -11,7 +11,7 @@
#
###########################################################################
@@ -355,7 +355,7 @@
fullpath = os.path.join(d, f)
diff -urNad zenoss~/Products/ZenModel/migrate/standarderrormessage.py zenoss/Products/ZenModel/migrate/standarderrormessage.py
--- zenoss~/Products/ZenModel/migrate/standarderrormessage.py 2007-06-05 15:19:35.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/standarderrormessage.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/standarderrormessage.py 2007-09-19 22:27:40.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision$"[11:-2]
@@ -367,7 +367,7 @@
version = Migrate.Version(0, 23, 0)
diff -urNad zenoss~/Products/ZenModel/migrate/twopointohobjects.py zenoss/Products/ZenModel/migrate/twopointohobjects.py
--- zenoss~/Products/ZenModel/migrate/twopointohobjects.py 2007-07-12 23:51:44.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/twopointohobjects.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/twopointohobjects.py 2007-09-19 22:27:40.000000000 +0200
@@ -25,7 +25,7 @@
dmd.Devices.manage_addRRDTemplate('softwareLoopback')
@@ -379,7 +379,7 @@
def _cleanupClass(self, dmd):
diff -urNad zenoss~/Products/ZenModel/zenbuild.py zenoss/Products/ZenModel/zenbuild.py
--- zenoss~/Products/ZenModel/zenbuild.py 2007-05-21 16:06:32.000000000 +0200
-+++ zenoss/Products/ZenModel/zenbuild.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/zenbuild.py 2007-09-19 22:27:40.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision: 1.11 $"[11:-2]
@@ -391,7 +391,7 @@
import transaction
diff -urNad zenoss~/Products/ZenModel/zendmd.py zenoss/Products/ZenModel/zendmd.py
--- zenoss~/Products/ZenModel/zendmd.py 2007-06-26 18:11:51.000000000 +0200
-+++ zenoss/Products/ZenModel/zendmd.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/zendmd.py 2007-09-19 22:27:40.000000000 +0200
@@ -11,7 +11,7 @@
#
###########################################################################
@@ -403,7 +403,7 @@
try:
diff -urNad zenoss~/Products/ZenModel/zenmib.py zenoss/Products/ZenModel/zenmib.py
--- zenoss~/Products/ZenModel/zenmib.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/zenmib.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenModel/zenmib.py 2007-09-19 22:27:40.000000000 +0200
@@ -11,7 +11,7 @@
#
###########################################################################
@@ -414,8 +414,8 @@
from sets import Set
import pprint
diff -urNad zenoss~/Products/ZenRRD/RenderServer.py zenoss/Products/ZenRRD/RenderServer.py
---- zenoss~/Products/ZenRRD/RenderServer.py 2007-09-06 02:45:32.000000000 +0200
-+++ zenoss/Products/ZenRRD/RenderServer.py 2007-09-07 00:25:41.000000000 +0200
+--- zenoss~/Products/ZenRRD/RenderServer.py 2007-09-11 16:27:54.000000000 +0200
++++ zenoss/Products/ZenRRD/RenderServer.py 2007-09-19 22:27:40.000000000 +0200
@@ -19,7 +19,7 @@
__version__ = "$Revision: 1.14 $"[11:-2]
@@ -427,7 +427,7 @@
import urllib
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateCpu.py zenoss/Products/ZenRRD/plugins/aggregateCpu.py
--- zenoss~/Products/ZenRRD/plugins/aggregateCpu.py 2007-06-05 15:19:35.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateCpu.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateCpu.py 2007-09-19 22:27:40.000000000 +0200
@@ -11,7 +11,7 @@
#
###########################################################################
@@ -439,7 +439,7 @@
import random
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateFreeMemory.py zenoss/Products/ZenRRD/plugins/aggregateFreeMemory.py
--- zenoss~/Products/ZenRRD/plugins/aggregateFreeMemory.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateFreeMemory.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateFreeMemory.py 2007-09-19 22:27:40.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#
@@ -451,7 +451,7 @@
import rrdtool
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateIdle.py zenoss/Products/ZenRRD/plugins/aggregateIdle.py
--- zenoss~/Products/ZenRRD/plugins/aggregateIdle.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateIdle.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateIdle.py 2007-09-19 22:27:40.000000000 +0200
@@ -11,7 +11,7 @@
#
###########################################################################
@@ -463,7 +463,7 @@
import rrdtool
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateNetwork.py zenoss/Products/ZenRRD/plugins/aggregateNetwork.py
--- zenoss~/Products/ZenRRD/plugins/aggregateNetwork.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateNetwork.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateNetwork.py 2007-09-19 22:27:40.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#
@@ -475,7 +475,7 @@
import rrdtool
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateSwap.py zenoss/Products/ZenRRD/plugins/aggregateSwap.py
--- zenoss~/Products/ZenRRD/plugins/aggregateSwap.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateSwap.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateSwap.py 2007-09-19 22:27:40.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#
@@ -487,7 +487,7 @@
import rrdtool
diff -urNad zenoss~/Products/ZenRRD/plugins/areaLine.py zenoss/Products/ZenRRD/plugins/areaLine.py
--- zenoss~/Products/ZenRRD/plugins/areaLine.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/areaLine.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/areaLine.py 2007-09-19 22:27:40.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#
@@ -499,7 +499,7 @@
import rrdtool
diff -urNad zenoss~/Products/ZenRRD/plugins/plugin.py zenoss/Products/ZenRRD/plugins/plugin.py
--- zenoss~/Products/ZenRRD/plugins/plugin.py 2007-07-05 22:09:00.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/plugin.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/plugin.py 2007-09-19 22:27:40.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#
@@ -511,7 +511,7 @@
TMPDIR='/tmp/renderserver'
diff -urNad zenoss~/Products/ZenRRD/plugins/randomExample.py zenoss/Products/ZenRRD/plugins/randomExample.py
--- zenoss~/Products/ZenRRD/plugins/randomExample.py 2007-04-25 21:01:19.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/randomExample.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/randomExample.py 2007-09-19 22:27:40.000000000 +0200
@@ -13,7 +13,7 @@
# It probably isn't a great example to follow style-wise.
@@ -523,7 +523,7 @@
import rrdtool
diff -urNad zenoss~/Products/ZenRRD/plugins/upperLower.py zenoss/Products/ZenRRD/plugins/upperLower.py
--- zenoss~/Products/ZenRRD/plugins/upperLower.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/upperLower.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/upperLower.py 2007-09-19 22:27:40.000000000 +0200
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#
@@ -535,7 +535,7 @@
import rrdtool
diff -urNad zenoss~/Products/ZenRRD/zentestcommand.py zenoss/Products/ZenRRD/zentestcommand.py
--- zenoss~/Products/ZenRRD/zentestcommand.py 2007-07-16 23:03:45.000000000 +0200
-+++ zenoss/Products/ZenRRD/zentestcommand.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenRRD/zentestcommand.py 2007-09-19 22:27:40.000000000 +0200
@@ -19,7 +19,7 @@
__version__ = "$Revision$"[11:-2]
@@ -546,11 +546,11 @@
import fcntl
import time
diff -urNad zenoss~/Products/ZenReports/ReportServer.py zenoss/Products/ZenReports/ReportServer.py
---- zenoss~/Products/ZenReports/ReportServer.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenReports/ReportServer.py 2007-09-07 00:25:41.000000000 +0200
-@@ -25,7 +25,7 @@
- from Products.ZenModel.ZenModelRM import ZenModelRM
+--- zenoss~/Products/ZenReports/ReportServer.py 2007-09-19 04:34:02.000000000 +0200
++++ zenoss/Products/ZenReports/ReportServer.py 2007-09-19 22:27:40.000000000 +0200
+@@ -26,7 +26,7 @@
from Products.ZenUtils.Utils import importClass
+ from Products.ZenModel.ZenossSecurity import *
-import os
+import pwd, os
@@ -559,7 +559,7 @@
class ReportServer(ZenModelRM):
diff -urNad zenoss~/Products/ZenUtils/ConfDaemon.py zenoss/Products/ZenUtils/ConfDaemon.py
--- zenoss~/Products/ZenUtils/ConfDaemon.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenUtils/ConfDaemon.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenUtils/ConfDaemon.py 2007-09-19 22:27:40.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision: 1.9 $"[11:-2]
@@ -571,7 +571,7 @@
import time
diff -urNad zenoss~/Products/ZenUtils/Graphics.py zenoss/Products/ZenUtils/Graphics.py
--- zenoss~/Products/ZenUtils/Graphics.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenUtils/Graphics.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenUtils/Graphics.py 2007-09-19 22:27:40.000000000 +0200
@@ -58,7 +58,7 @@
@@ -583,7 +583,7 @@
os.system("$ZENHOME/bin/dot -c")
diff -urNad zenoss~/Products/ZenUtils/ZCmdBase.py zenoss/Products/ZenUtils/ZCmdBase.py
--- zenoss~/Products/ZenUtils/ZCmdBase.py 2007-06-15 16:54:49.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZCmdBase.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenUtils/ZCmdBase.py 2007-09-19 22:27:40.000000000 +0200
@@ -26,7 +26,7 @@
from Exceptions import ZentinelException
from ZenDaemon import ZenDaemon
@@ -595,7 +595,7 @@
defaultCacheDir = os.path.join(defaultCacheDir, 'var')
diff -urNad zenoss~/Products/ZenUtils/ZenBackup.py zenoss/Products/ZenUtils/ZenBackup.py
--- zenoss~/Products/ZenUtils/ZenBackup.py 2007-07-05 22:09:00.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenBackup.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenBackup.py 2007-09-19 22:27:40.000000000 +0200
@@ -21,8 +21,8 @@
import Globals
from ZCmdBase import ZCmdBase
@@ -609,7 +609,7 @@
import ConfigParser
diff -urNad zenoss~/Products/ZenUtils/ZenBackupBase.py zenoss/Products/ZenUtils/ZenBackupBase.py
--- zenoss~/Products/ZenUtils/ZenBackupBase.py 2007-06-04 21:32:10.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenBackupBase.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenBackupBase.py 2007-09-19 22:27:40.000000000 +0200
@@ -18,8 +18,8 @@
Common code for zenbackup.py and zenrestore.py
'''
@@ -623,7 +623,7 @@
diff -urNad zenoss~/Products/ZenUtils/ZenDaemon.py zenoss/Products/ZenUtils/ZenDaemon.py
--- zenoss~/Products/ZenUtils/ZenDaemon.py 2007-07-10 21:53:24.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenDaemon.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenDaemon.py 2007-09-19 22:27:40.000000000 +0200
@@ -20,7 +20,7 @@
__version__ = "$Revision: 1.9 $"[11:-2]
@@ -635,7 +635,7 @@
import logging
diff -urNad zenoss~/Products/ZenUtils/ZenScriptBase.py zenoss/Products/ZenUtils/ZenScriptBase.py
--- zenoss~/Products/ZenUtils/ZenScriptBase.py 2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenScriptBase.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenScriptBase.py 2007-09-19 22:27:40.000000000 +0200
@@ -22,7 +22,7 @@
from Exceptions import ZentinelException
@@ -647,7 +647,7 @@
defaultCacheDir = os.path.join(defaultCacheDir, 'var')
diff -urNad zenoss~/Products/ZenUtils/zenpack.py zenoss/Products/ZenUtils/zenpack.py
--- zenoss~/Products/ZenUtils/zenpack.py 2007-07-31 20:31:25.000000000 +0200
-+++ zenoss/Products/ZenUtils/zenpack.py 2007-09-07 00:25:41.000000000 +0200
++++ zenoss/Products/ZenUtils/zenpack.py 2007-09-19 22:27:40.000000000 +0200
@@ -21,8 +21,8 @@
from StringIO import StringIO
import ConfigParser
Modified: trunk/packages/zenoss/debian/patches/ZENHOME30-os.environ.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME30-os.environ.dpatch?rev=293&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME30-os.environ.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME30-os.environ.dpatch Wed Sep 19 20:30:36 2007
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad zenoss~/Products/ZenEvents/zensendsyslog.py zenoss/Products/ZenEvents/zensendsyslog.py
---- zenoss~/Products/ZenEvents/zensendsyslog.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenEvents/zensendsyslog.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenEvents/zensendsyslog.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenEvents/zensendsyslog.py 2007-09-19 22:28:50.000000000 +0200
@@ -15,7 +15,7 @@
import socket
import time
@@ -18,8 +18,8 @@
defaultInfile = os.path.join(logdir, "origsyslog.log")
diff -urNad zenoss~/Products/ZenEvents/zensyslog.py zenoss/Products/ZenEvents/zensyslog.py
---- zenoss~/Products/ZenEvents/zensyslog.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenEvents/zensyslog.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenEvents/zensyslog.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenEvents/zensyslog.py 2007-09-19 22:28:50.000000000 +0200
@@ -57,7 +57,7 @@
self.olog = logging.getLogger("origsyslog")
self.olog.setLevel(20)
@@ -30,8 +30,8 @@
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-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenHub/zenhub.py 2007-09-07 00:27:27.000000000 +0200
+--- zenoss~/Products/ZenHub/zenhub.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenHub/zenhub.py 2007-09-19 22:28:50.000000000 +0200
@@ -282,7 +282,7 @@
dest='passwordfile',
type='string',
@@ -42,8 +42,8 @@
diff -urNad zenoss~/Products/ZenModel/DataRoot.py zenoss/Products/ZenModel/DataRoot.py
---- zenoss~/Products/ZenModel/DataRoot.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/DataRoot.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenModel/DataRoot.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/DataRoot.py 2007-09-19 22:28:50.000000000 +0200
@@ -468,7 +468,7 @@
pack.version = version
self.packs._setObject(id, pack)
@@ -63,32 +63,32 @@
for pack in ids:
os.system('%s run --remove %s' % (zp, pack))
diff -urNad zenoss~/Products/ZenModel/Device.py zenoss/Products/ZenModel/Device.py
---- zenoss~/Products/ZenModel/Device.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/Device.py 2007-09-07 00:28:16.000000000 +0200
-@@ -1262,7 +1262,7 @@
+--- zenoss~/Products/ZenModel/Device.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/Device.py 2007-09-19 22:29:22.000000000 +0200
+@@ -1265,7 +1265,7 @@
handler = setWebLoggingStream(response)
try:
-- zm = os.path.join(os.environ['ZENHOME'], 'bin', 'zenmodeler')
-+ zm = os.path.join(pwd.getpwnam('zenoss')[5], 'bin', 'zenmodeler')
- zenmodelerCmd = '%s run --now -F -d %s' % (zm, self.id)
- log.info('Executing command: %s' % zenmodelerCmd)
+- zm = os.path.join(os.environ['ZENHOME'], 'bin', 'zenmodeler')
++ zm = os.path.join(pwd.getpwnam('zenoss')[5], 'bin', 'zenmodeler')
+ zenmodelerCmd = [zm, 'run', '--now', '-F', '-d', self.id]
+ log.info('Executing command: %s' % ' '.join(zenmodelerCmd))
f = Popen4(zenmodelerCmd)
diff -urNad zenoss~/Products/ZenModel/IpNetwork.py zenoss/Products/ZenModel/IpNetwork.py
---- zenoss~/Products/ZenModel/IpNetwork.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/IpNetwork.py 2007-09-07 00:26:32.000000000 +0200
-@@ -438,7 +438,7 @@
+--- zenoss~/Products/ZenModel/IpNetwork.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/IpNetwork.py 2007-09-19 22:29:22.000000000 +0200
+@@ -446,7 +446,7 @@
try:
- organizer = orgroot.getOrganizer(organizerName)
+ organizer = orgroot._getNet(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)
+ zendiscCmd = [zd, "run", '--net', organizer.id]
+ log.info('Executing command: %s' % ' '.join(zendiscCmd))
f = Popen4(zendiscCmd)
diff -urNad zenoss~/Products/ZenModel/PerformanceConf.py zenoss/Products/ZenModel/PerformanceConf.py
---- zenoss~/Products/ZenModel/PerformanceConf.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/PerformanceConf.py 2007-09-07 00:28:16.000000000 +0200
+--- zenoss~/Products/ZenModel/PerformanceConf.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/PerformanceConf.py 2007-09-19 22:28:50.000000000 +0200
@@ -64,7 +64,7 @@
def performancePath(target):
global PERF_ROOT
@@ -99,8 +99,8 @@
return os.path.join(PERF_ROOT, target)
diff -urNad zenoss~/Products/ZenModel/ZenPack.py zenoss/Products/ZenModel/ZenPack.py
---- zenoss~/Products/ZenModel/ZenPack.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenPack.py 2007-09-07 00:28:16.000000000 +0200
+--- zenoss~/Products/ZenModel/ZenPack.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/ZenPack.py 2007-09-19 22:29:22.000000000 +0200
@@ -290,7 +290,7 @@
@@ -111,8 +111,8 @@
# ZenPackBase is here for backwards compatibility with older installed
diff -urNad zenoss~/Products/ZenModel/ZenPackLoader.py zenoss/Products/ZenModel/ZenPackLoader.py
---- zenoss~/Products/ZenModel/ZenPackLoader.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenPackLoader.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenModel/ZenPackLoader.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/ZenPackLoader.py 2007-09-19 22:28:50.000000000 +0200
@@ -164,7 +164,7 @@
@@ -123,20 +123,20 @@
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-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/Migrate.py 2007-09-07 00:26:32.000000000 +0200
-@@ -42,7 +42,7 @@
- def cleanup():
+--- zenoss~/Products/ZenModel/migrate/Migrate.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/Migrate.py 2007-09-19 22:29:22.000000000 +0200
+@@ -43,7 +43,7 @@
"recursively remove all files ending with .pyc"
import pwd, os
+ count = 0
- 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-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/command.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/command.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/command.py 2007-09-19 22:28:50.000000000 +0200
@@ -31,7 +31,7 @@
def cutover(self, dmd):
import pwd, os
@@ -147,8 +147,8 @@
dmd.Devices._delProperty("zNagiosCycleTime")
zem = self.dmd.ZenEventManager
diff -urNad zenoss~/Products/ZenModel/migrate/kill_cricket.py zenoss/Products/ZenModel/migrate/kill_cricket.py
---- zenoss~/Products/ZenModel/migrate/kill_cricket.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/kill_cricket.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/kill_cricket.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/kill_cricket.py 2007-09-19 22:28:50.000000000 +0200
@@ -93,7 +93,7 @@
from Products.ZenRelations.ImportRM import ImportRM
imp = ImportRM(noopts=True, app=dmd.getPhysicalRoot())
@@ -159,8 +159,8 @@
imp.loadDatabase()
diff -urNad zenoss~/Products/ZenModel/migrate/menus.py zenoss/Products/ZenModel/migrate/menus.py
---- zenoss~/Products/ZenModel/migrate/menus.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/menus.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/menus.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/menus.py 2007-09-19 22:28:50.000000000 +0200
@@ -24,7 +24,7 @@
from Products.ZenModel.DeviceClass import DeviceClass
from Products.ZenModel.Device import Device
@@ -171,8 +171,8 @@
ZenPackItems = dict(
diff -urNad zenoss~/Products/ZenModel/migrate/processes.py zenoss/Products/ZenModel/migrate/processes.py
---- zenoss~/Products/ZenModel/migrate/processes.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/processes.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/processes.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/processes.py 2007-09-19 22:28:50.000000000 +0200
@@ -41,7 +41,7 @@
imp = ImportRM(noopts=True, app=dmd.getPhysicalRoot())
imp.options.noCommit = True
@@ -183,8 +183,8 @@
imp.loadDatabase()
diff -urNad zenoss~/Products/ZenModel/migrate/procparams.py zenoss/Products/ZenModel/migrate/procparams.py
---- zenoss~/Products/ZenModel/migrate/procparams.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/procparams.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/procparams.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/procparams.py 2007-09-19 22:28:50.000000000 +0200
@@ -24,7 +24,7 @@
import pwd, os
import pwd, os.path
@@ -195,8 +195,8 @@
procs,
dmd.ZenEventManager.username,
diff -urNad zenoss~/Products/ZenModel/migrate/rrdmin.py zenoss/Products/ZenModel/migrate/rrdmin.py
---- zenoss~/Products/ZenModel/migrate/rrdmin.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/rrdmin.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/rrdmin.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/rrdmin.py 2007-09-19 22:28:50.000000000 +0200
@@ -36,7 +36,7 @@
version = Migrate.Version(0, 22, 0)
@@ -207,8 +207,8 @@
rrdtool.tune(os.path.join(d, f), '-i', 'ds0:' + value)
diff -urNad zenoss~/Products/ZenModel/migrate/smtpsnpp.py zenoss/Products/ZenModel/migrate/smtpsnpp.py
---- zenoss~/Products/ZenModel/migrate/smtpsnpp.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/smtpsnpp.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/smtpsnpp.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/smtpsnpp.py 2007-09-19 22:28:50.000000000 +0200
@@ -46,7 +46,7 @@
def cutover(self, dmd):
options = OptionsBucket()
@@ -219,8 +219,8 @@
if not hasattr(dmd, 'smtpHost'):
dmd.smtpHost = getattr(options, 'smtphost', '') or 'localhost'
diff -urNad zenoss~/Products/ZenModel/migrate/standalone_datapoint_rename.py zenoss/Products/ZenModel/migrate/standalone_datapoint_rename.py
---- zenoss~/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-09-19 22:28:50.000000000 +0200
@@ -12,7 +12,7 @@
###########################################################################
#!/usr/bin/python
@@ -231,8 +231,8 @@
fullpath = os.path.join(d, f)
if f.find('_') >= 0: continue
diff -urNad zenoss~/Products/ZenModel/migrate/twopointohobjects.py zenoss/Products/ZenModel/migrate/twopointohobjects.py
---- zenoss~/Products/ZenModel/migrate/twopointohobjects.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/twopointohobjects.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/twopointohobjects.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/twopointohobjects.py 2007-09-19 22:28:50.000000000 +0200
@@ -26,7 +26,7 @@
def _zCommandPath(self, dmd):
@@ -243,8 +243,8 @@
def _cleanupClass(self, dmd):
d = [d.id for d in dmd.Devices.Server.Linux.getSubDevices()]
diff -urNad zenoss~/Products/ZenModel/zenbuild.py zenoss/Products/ZenModel/zenbuild.py
---- zenoss~/Products/ZenModel/zenbuild.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/zenbuild.py 2007-09-07 00:28:16.000000000 +0200
+--- zenoss~/Products/ZenModel/zenbuild.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/zenbuild.py 2007-09-19 22:29:22.000000000 +0200
@@ -29,7 +29,7 @@
print "ERROR: ZENHOME envrionment variable not set"
sys.exit(1)
@@ -264,8 +264,8 @@
Zope2.configure(zopeconf)
self.app = Zope2.app()
diff -urNad zenoss~/Products/ZenModel/zenmib.py zenoss/Products/ZenModel/zenmib.py
---- zenoss~/Products/ZenModel/zenmib.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenModel/zenmib.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenModel/zenmib.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenModel/zenmib.py 2007-09-19 22:28:50.000000000 +0200
@@ -137,7 +137,7 @@
def load(self):
@@ -276,9 +276,9 @@
map(lambda x: os.path.join(smimibdir, x),
'ietf iana irtf tubs site'.split())
diff -urNad zenoss~/Products/ZenRRD/RenderServer.py zenoss/Products/ZenRRD/RenderServer.py
---- zenoss~/Products/ZenRRD/RenderServer.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenRRD/RenderServer.py 2007-09-07 00:26:32.000000000 +0200
-@@ -217,7 +217,7 @@
+--- zenoss~/Products/ZenRRD/RenderServer.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenRRD/RenderServer.py 2007-09-19 22:28:50.000000000 +0200
+@@ -222,7 +222,7 @@
"render a custom graph and return it"
try:
dmd = self.dmd
@@ -288,8 +288,8 @@
exec open(m)
return graph
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateCpu.py zenoss/Products/ZenRRD/plugins/aggregateCpu.py
---- zenoss~/Products/ZenRRD/plugins/aggregateCpu.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateCpu.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenRRD/plugins/aggregateCpu.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateCpu.py 2007-09-19 22:28:50.000000000 +0200
@@ -39,7 +39,7 @@
fname = "%s/graph-%s.png" % (TMPDIR,name)
cmd = [fname,] + basicArgs(env) + args
@@ -300,8 +300,8 @@
rfiles = []
devicePat = re.compile('.*(' + devices + ').*')
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateFreeMemory.py zenoss/Products/ZenRRD/plugins/aggregateFreeMemory.py
---- zenoss~/Products/ZenRRD/plugins/aggregateFreeMemory.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateFreeMemory.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenRRD/plugins/aggregateFreeMemory.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateFreeMemory.py 2007-09-19 22:28:50.000000000 +0200
@@ -45,7 +45,7 @@
'--vertical-label=%(label)s' % env] + args
ifiles = []
@@ -312,8 +312,8 @@
devicePat = re.compile('.*(' + env.get('devices', '') + ').*')
for d, _, fs in os.walk(perf):
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateIdle.py zenoss/Products/ZenRRD/plugins/aggregateIdle.py
---- zenoss~/Products/ZenRRD/plugins/aggregateIdle.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateIdle.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenRRD/plugins/aggregateIdle.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateIdle.py 2007-09-19 22:28:50.000000000 +0200
@@ -46,7 +46,7 @@
'--lower-limit=0',
'--vertical-label=%(label)s' % env] + args
@@ -324,8 +324,8 @@
rfiles = []
for d, _, fs in os.walk(perf):
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateNetwork.py zenoss/Products/ZenRRD/plugins/aggregateNetwork.py
---- zenoss~/Products/ZenRRD/plugins/aggregateNetwork.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateNetwork.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenRRD/plugins/aggregateNetwork.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateNetwork.py 2007-09-19 22:28:50.000000000 +0200
@@ -38,7 +38,7 @@
'--vertical-label=%(label)s' % env]
ifiles = []
@@ -336,8 +336,8 @@
for d, _, fs in os.walk(perf):
for f in fs:
diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateSwap.py zenoss/Products/ZenRRD/plugins/aggregateSwap.py
---- zenoss~/Products/ZenRRD/plugins/aggregateSwap.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateSwap.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenRRD/plugins/aggregateSwap.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateSwap.py 2007-09-19 22:28:50.000000000 +0200
@@ -44,7 +44,7 @@
'--vertical-label=%(label)s' % env] + args
ifiles = []
@@ -348,8 +348,8 @@
devicePat = re.compile('.*(' + env.get('devices', '') + ').*')
for d, _, fs in os.walk(perf):
diff -urNad zenoss~/Products/ZenRRD/plugins/areaLine.py zenoss/Products/ZenRRD/plugins/areaLine.py
---- zenoss~/Products/ZenRRD/plugins/areaLine.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/areaLine.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenRRD/plugins/areaLine.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/areaLine.py 2007-09-19 22:28:50.000000000 +0200
@@ -42,7 +42,7 @@
fname = "%s/graph-%s.png" % (TMPDIR,name)
afiles = []
@@ -360,8 +360,8 @@
for d, _, fs in os.walk(perf):
if not devPat.match(d): continue
diff -urNad zenoss~/Products/ZenRRD/plugins/plugin.py zenoss/Products/ZenRRD/plugins/plugin.py
---- zenoss~/Products/ZenRRD/plugins/plugin.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/plugin.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenRRD/plugins/plugin.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/plugin.py 2007-09-19 22:28:50.000000000 +0200
@@ -50,7 +50,7 @@
except OSError:
return None
@@ -372,8 +372,8 @@
title = 'Plugin Title'
label = ''
diff -urNad zenoss~/Products/ZenRRD/plugins/upperLower.py zenoss/Products/ZenRRD/plugins/upperLower.py
---- zenoss~/Products/ZenRRD/plugins/upperLower.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/upperLower.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenRRD/plugins/upperLower.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/upperLower.py 2007-09-19 22:28:50.000000000 +0200
@@ -42,7 +42,7 @@
fname = "%s/graph-%s.png" % (TMPDIR,name)
lfiles = []
@@ -385,7 +385,7 @@
if not devPat.match(d): continue
diff -urNad zenoss~/Products/ZenRelations/schemadoc.py zenoss/Products/ZenRelations/schemadoc.py
--- zenoss~/Products/ZenRelations/schemadoc.py 2007-07-05 22:09:00.000000000 +0200
-+++ zenoss/Products/ZenRelations/schemadoc.py 2007-09-07 00:26:32.000000000 +0200
++++ zenoss/Products/ZenRelations/schemadoc.py 2007-09-19 22:28:50.000000000 +0200
@@ -142,7 +142,7 @@
baseModule = None
if len(sys.argv) > 1:
@@ -396,9 +396,9 @@
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-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenReports/ReportServer.py 2007-09-07 00:26:32.000000000 +0200
-@@ -37,7 +37,7 @@
+--- zenoss~/Products/ZenReports/ReportServer.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenReports/ReportServer.py 2007-09-19 22:28:50.000000000 +0200
+@@ -38,7 +38,7 @@
"Run a plugin to generate the report object"
dmd = self.dmd
args = dict(zip(REQUEST.keys(), REQUEST.values()))
@@ -408,8 +408,8 @@
directories = [
p.path('reports', 'plugins') for p in self.packs()
diff -urNad zenoss~/Products/ZenUtils/ConfDaemon.py zenoss/Products/ZenUtils/ConfDaemon.py
---- zenoss~/Products/ZenUtils/ConfDaemon.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenUtils/ConfDaemon.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenUtils/ConfDaemon.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenUtils/ConfDaemon.py 2007-09-19 22:28:50.000000000 +0200
@@ -60,7 +60,7 @@
print >>sys.stderr, ("fork #2 failed: %d (%s)" %
(e.errno, e.strerror))
@@ -420,8 +420,8 @@
if os.path.exists(zenhome):
file = open(pidfile, 'w')
diff -urNad zenoss~/Products/ZenUtils/Graphics.py zenoss/Products/ZenUtils/Graphics.py
---- zenoss~/Products/ZenUtils/Graphics.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenUtils/Graphics.py 2007-09-07 00:28:16.000000000 +0200
+--- zenoss~/Products/ZenUtils/Graphics.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenUtils/Graphics.py 2007-09-19 22:29:22.000000000 +0200
@@ -59,7 +59,7 @@
def setGraphFromEdges(self, edges, directed=True):
@@ -432,8 +432,8 @@
os.system("$ZENHOME/bin/dot -c")
import pydot
diff -urNad zenoss~/Products/ZenUtils/ZenDaemon.py zenoss/Products/ZenUtils/ZenDaemon.py
---- zenoss~/Products/ZenUtils/ZenDaemon.py 2007-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenDaemon.py 2007-09-07 00:26:32.000000000 +0200
+--- zenoss~/Products/ZenUtils/ZenDaemon.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenDaemon.py 2007-09-19 22:28:50.000000000 +0200
@@ -50,7 +50,7 @@
def __init__(self, noopts=0, keeproot=False):
CmdBase.__init__(self, noopts)
@@ -453,8 +453,8 @@
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-09-07 00:26:31.000000000 +0200
-+++ zenoss/Products/ZenUtils/zenpack.py 2007-09-07 00:28:16.000000000 +0200
+--- zenoss~/Products/ZenUtils/zenpack.py 2007-09-19 22:28:50.000000000 +0200
++++ zenoss/Products/ZenUtils/zenpack.py 2007-09-19 22:29:22.000000000 +0200
@@ -166,7 +166,7 @@
root = zenPackPath(packName)
self.log.debug('Extracting ZenPack "%s"' % packName)
Modified: trunk/packages/zenoss/debian/patches/ZENHOME40-os.getent.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME40-os.getent.dpatch?rev=293&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME40-os.getent.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME40-os.getent.dpatch Wed Sep 19 20:30:36 2007
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad zenoss~/Products/ZenModel/DeviceClass.py zenoss/Products/ZenModel/DeviceClass.py
---- zenoss~/Products/ZenModel/DeviceClass.py 2007-09-07 00:29:21.000000000 +0200
-+++ zenoss/Products/ZenModel/DeviceClass.py 2007-09-07 00:29:31.000000000 +0200
-@@ -483,7 +483,7 @@
+--- zenoss~/Products/ZenModel/DeviceClass.py 2007-09-19 22:29:57.000000000 +0200
++++ zenoss/Products/ZenModel/DeviceClass.py 2007-09-19 22:29:58.000000000 +0200
+@@ -510,7 +510,7 @@
"""Get a list of XML filenames and basenames from the ZENHOME/import
directory.
"""
@@ -18,9 +18,9 @@
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-09-07 00:29:21.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenModelRM.py 2007-09-07 00:29:22.000000000 +0200
-@@ -107,7 +107,7 @@
+--- zenoss~/Products/ZenModel/ZenModelRM.py 2007-09-19 22:29:57.000000000 +0200
++++ zenoss/Products/ZenModel/ZenModelRM.py 2007-09-19 22:29:58.000000000 +0200
+@@ -103,7 +103,7 @@
dest = 'filesystem'
if REQUEST:
dest = REQUEST.form.get('dest')
@@ -30,8 +30,8 @@
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-09-07 00:29:21.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenPack.py 2007-09-07 00:29:22.000000000 +0200
+--- zenoss~/Products/ZenModel/ZenPack.py 2007-09-19 22:29:57.000000000 +0200
++++ zenoss/Products/ZenModel/ZenPack.py 2007-09-19 22:29:58.000000000 +0200
@@ -250,7 +250,7 @@
fp.close()
@@ -42,8 +42,8 @@
if not os.path.isdir(path):
os.makeDirs(path, 0750)
diff -urNad zenoss~/Products/ZenModel/ZenossInfo.py zenoss/Products/ZenModel/ZenossInfo.py
---- zenoss~/Products/ZenModel/ZenossInfo.py 2007-09-07 00:29:21.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenossInfo.py 2007-09-07 00:29:22.000000000 +0200
+--- zenoss~/Products/ZenModel/ZenossInfo.py 2007-09-19 22:29:57.000000000 +0200
++++ zenoss/Products/ZenModel/ZenossInfo.py 2007-09-19 22:29:58.000000000 +0200
@@ -179,7 +179,7 @@
v = Version(*getRRDToolVersion())
v.full()
@@ -108,8 +108,8 @@
# we actually want to block here, so that the page doesn't refresh
# until the action has completed
diff -urNad zenoss~/Products/ZenModel/migrate/about_zenoss.py zenoss/Products/ZenModel/migrate/about_zenoss.py
---- zenoss~/Products/ZenModel/migrate/about_zenoss.py 2007-09-07 00:29:21.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/about_zenoss.py 2007-09-07 00:29:22.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/about_zenoss.py 2007-09-19 22:29:57.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/about_zenoss.py 2007-09-19 22:29:58.000000000 +0200
@@ -26,7 +26,7 @@
import Migrate
@@ -120,8 +120,8 @@
class AboutZenoss(Migrate.Step):
version = Migrate.Version(0, 23, 0)
diff -urNad zenoss~/Products/ZenModel/migrate/betterstandarderrormessage.py zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py
---- zenoss~/Products/ZenModel/migrate/betterstandarderrormessage.py 2007-09-07 00:29:21.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py 2007-09-07 00:29:22.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/betterstandarderrormessage.py 2007-09-19 22:29:57.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py 2007-09-19 22:29:58.000000000 +0200
@@ -31,7 +31,7 @@
app = dmd.getPhysicalRoot()
if app.hasObject('standard_error_message'):
@@ -132,8 +132,8 @@
zenhome)
try:
diff -urNad zenoss~/Products/ZenModel/migrate/datapoints.py zenoss/Products/ZenModel/migrate/datapoints.py
---- zenoss~/Products/ZenModel/migrate/datapoints.py 2007-09-07 00:29:21.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/datapoints.py 2007-09-07 00:29:22.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/datapoints.py 2007-09-19 22:29:57.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/datapoints.py 2007-09-19 22:29:58.000000000 +0200
@@ -71,7 +71,7 @@
s.datapoints._setObject(p.id, p)
@@ -144,8 +144,8 @@
self.cutoverDataSource(s)
oldname = os.path.join(oldbase + rrdPath, s.id)
diff -urNad zenoss~/Products/ZenModel/migrate/evenbetterstandarderrormessage.py zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py
---- zenoss~/Products/ZenModel/migrate/evenbetterstandarderrormessage.py 2007-09-07 00:29:21.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py 2007-09-07 00:29:22.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/evenbetterstandarderrormessage.py 2007-09-19 22:29:57.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py 2007-09-19 22:29:58.000000000 +0200
@@ -22,7 +22,7 @@
app = dmd.getPhysicalRoot()
if app.hasObject('standard_error_message'):
@@ -156,8 +156,8 @@
zenhome)
try:
diff -urNad zenoss~/Products/ZenModel/migrate/hoist_perf_data.py zenoss/Products/ZenModel/migrate/hoist_perf_data.py
---- zenoss~/Products/ZenModel/migrate/hoist_perf_data.py 2007-09-07 00:29:21.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/hoist_perf_data.py 2007-09-07 00:29:22.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/hoist_perf_data.py 2007-09-19 22:29:57.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/hoist_perf_data.py 2007-09-19 22:29:58.000000000 +0200
@@ -36,7 +36,7 @@
import glob
names = dmd.getDmdRoot('Devices').getOrganizerNames(True)
@@ -168,8 +168,8 @@
names.reverse()
for name in names:
diff -urNad zenoss~/Products/ZenModel/migrate/import_export_filesystem.py zenoss/Products/ZenModel/migrate/import_export_filesystem.py
---- zenoss~/Products/ZenModel/migrate/import_export_filesystem.py 2007-09-07 00:29:21.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/import_export_filesystem.py 2007-09-07 00:29:22.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/import_export_filesystem.py 2007-09-19 22:29:57.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/import_export_filesystem.py 2007-09-19 22:29:58.000000000 +0200
@@ -24,7 +24,7 @@
import Migrate
@@ -180,8 +180,8 @@
class ImportExportFilesystem(Migrate.Step):
version = Migrate.Version(0, 23, 0)
diff -urNad zenoss~/Products/ZenModel/migrate/standarderrormessage.py zenoss/Products/ZenModel/migrate/standarderrormessage.py
---- zenoss~/Products/ZenModel/migrate/standarderrormessage.py 2007-09-07 00:29:21.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/standarderrormessage.py 2007-09-07 00:29:22.000000000 +0200
+--- zenoss~/Products/ZenModel/migrate/standarderrormessage.py 2007-09-19 22:29:57.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/standarderrormessage.py 2007-09-19 22:29:58.000000000 +0200
@@ -32,7 +32,7 @@
app = dmd.getPhysicalRoot()
if app.hasObject('standard_error_message'):
@@ -192,8 +192,8 @@
zenhome)
try:
diff -urNad zenoss~/Products/ZenModel/zendmd.py zenoss/Products/ZenModel/zendmd.py
---- zenoss~/Products/ZenModel/zendmd.py 2007-09-07 00:29:21.000000000 +0200
-+++ zenoss/Products/ZenModel/zendmd.py 2007-09-07 00:29:22.000000000 +0200
+--- zenoss~/Products/ZenModel/zendmd.py 2007-09-19 22:29:57.000000000 +0200
++++ zenoss/Products/ZenModel/zendmd.py 2007-09-19 22:29:58.000000000 +0200
@@ -34,7 +34,7 @@
# Itamar Shtull-Trauring of Twisted Python. A current copy of his
# original code is available at http://pastebin.adytum.us/40 though
@@ -204,8 +204,8 @@
def save_history(historyPath=historyPath):
import readline
diff -urNad zenoss~/Products/ZenRRD/zentestcommand.py zenoss/Products/ZenRRD/zentestcommand.py
---- zenoss~/Products/ZenRRD/zentestcommand.py 2007-09-07 00:29:21.000000000 +0200
-+++ zenoss/Products/ZenRRD/zentestcommand.py 2007-09-07 00:29:22.000000000 +0200
+--- zenoss~/Products/ZenRRD/zentestcommand.py 2007-09-19 22:29:57.000000000 +0200
++++ zenoss/Products/ZenRRD/zentestcommand.py 2007-09-19 22:29:58.000000000 +0200
@@ -61,7 +61,7 @@
return dataSource.getCommand(device)
@@ -216,8 +216,8 @@
flags = fcntl.fcntl(child.fromchild, fcntl.F_GETFL)
fcntl.fcntl(child.fromchild, fcntl.F_SETFL, flags | os.O_NDELAY)
diff -urNad zenoss~/Products/ZenUtils/ZCmdBase.py zenoss/Products/ZenUtils/ZCmdBase.py
---- zenoss~/Products/ZenUtils/ZCmdBase.py 2007-09-07 00:29:21.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZCmdBase.py 2007-09-07 00:29:22.000000000 +0200
+--- zenoss~/Products/ZenUtils/ZCmdBase.py 2007-09-19 22:29:57.000000000 +0200
++++ zenoss/Products/ZenUtils/ZCmdBase.py 2007-09-19 22:29:58.000000000 +0200
@@ -27,7 +27,7 @@
from ZenDaemon import ZenDaemon
@@ -228,8 +228,8 @@
defaultCacheDir = os.path.join(defaultCacheDir, 'var')
diff -urNad zenoss~/Products/ZenUtils/ZenBackupBase.py zenoss/Products/ZenUtils/ZenBackupBase.py
---- zenoss~/Products/ZenUtils/ZenBackupBase.py 2007-09-07 00:29:21.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenBackupBase.py 2007-09-07 00:29:31.000000000 +0200
+--- zenoss~/Products/ZenUtils/ZenBackupBase.py 2007-09-19 22:29:57.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenBackupBase.py 2007-09-19 22:29:58.000000000 +0200
@@ -40,7 +40,7 @@
def __init__(self, noopts=0):
@@ -240,8 +240,8 @@
diff -urNad zenoss~/Products/ZenUtils/ZenScriptBase.py zenoss/Products/ZenUtils/ZenScriptBase.py
---- zenoss~/Products/ZenUtils/ZenScriptBase.py 2007-09-07 00:29:21.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenScriptBase.py 2007-09-07 00:29:22.000000000 +0200
+--- zenoss~/Products/ZenUtils/ZenScriptBase.py 2007-09-19 22:29:57.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenScriptBase.py 2007-09-19 22:29:58.000000000 +0200
@@ -23,7 +23,7 @@
from Exceptions import ZentinelException
More information about the Pkg-zenoss-commits
mailing list