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

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

Author: bzed-guest
Date: Sun Jun 17 17:30:40 2007
New Revision: 144

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=144
Log:
fixing the fix to work with the fix for the fix

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=144&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:30:40 2007
@@ -15,7 +15,7 @@
 -    print "ERROR: ZENHOME envrionment variable not set"
 -    sys.exit(1)
 -
- zenhome = pwd.getpwnam('zenoss')
+ zenhome = pwd.getpwnam('zenoss')[5]
  
  import Globals
 @@ -42,9 +38,6 @@
@@ -25,6 +25,6 @@
 -        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")
+         zopeconf = os.path.join(pwd.getpwnam('zenoss')[5], "etc/zope.conf")
          import Zope2
          Zope2.configure(zopeconf)