[Pkg-zenoss-commits] r142 - /packages/zenoss/trunk/debian/patches/remove-ZENHOME-rest.dpatch

[bzed-guest at users.alioth.debian.org]

Author: bzed-guest
Date: Sun Jun 17 17:24:58 2007
New Revision: 142

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=142
Log:
... no comment...

Modified:
    packages/zenoss/trunk/debian/patches/remove-ZENHOME-rest.dpatch

Modified: packages/zenoss/trunk/debian/patches/remove-ZENHOME-rest.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/remove-ZENHOME-rest.dpatch?rev=142&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/patches/remove-ZENHOME-rest.dpatch (original)
+++ packages/zenoss/trunk/debian/patches/remove-ZENHOME-rest.dpatch Sun Jun 17 17:24:58 2007
@@ -5,8 +5,8 @@
 
 @DPATCH@
 diff -urNad zenoss~/Products/ZenModel/zenbuild.py zenoss/Products/ZenModel/zenbuild.py
---- zenoss~/Products/ZenModel/zenbuild.py	2007-06-15 16:49:11.000000000 +0100
-+++ zenoss/Products/ZenModel/zenbuild.py	2007-06-15 16:50:09.000000000 +0100
+--- zenoss~/Products/ZenModel/zenbuild.py	2007-06-17 18:24:23.000000000 +0100
++++ zenoss/Products/ZenModel/zenbuild.py	2007-06-17 18:24:41.000000000 +0100
 @@ -25,10 +25,6 @@
  import Globals
  import transaction
@@ -18,3 +18,13 @@
  zenhome = pwd.getpwnam('zenoss')
  
  import Globals
+@@ -42,9 +38,6 @@
+     
+     def __init__(self):
+         CmdBase.__init__(self)
+-        if not os.environ.has_key("ZENHOME"):
+-            print "ERROR: ZENHOME not set."
+-            sys.exit(1)
+         zopeconf = os.path.join(pwd.getpwnam('zenoss'), "etc/zope.conf")
+         import Zope2
+         Zope2.configure(zopeconf)