reload needs to call zope restart

4 files changed, 16 insertions, 19 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index 4626bc33d6c6..61eec4829866 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-zope/zope
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.53 2004/10/25 07:27:13 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.54 2004/10/25 14:36:24 batlogg Exp $
+
+  25 Oct 2004; Jodok Batlogg <batlogg@gentoo.org>; files/2.7.2/zope.initd,
+  files/2.7.3/zope.initd:
+  reload needs to call zope's restart
 
 *zope-2.7.3 (24 Oct 2004)
 
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index bb5f9f40ae7e..28cd77204d71 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -1,7 +1,7 @@
 MD5 6649fe5786ca04047e024eff6ea386ad zope-2.7.1.ebuild 3816
 MD5 8442485a0f287280f6b398201356369f zope-2.7.3.ebuild 3221
 MD5 ff3f3ff791f9c791bb13d1276ce98de3 zope-2.6.4-r1.ebuild 5622
-MD5 5f5d165a0eb3b71eaf51913a595a3fd5 ChangeLog 9506
+MD5 d7fde4138f6dfc586aff52df70a2136d ChangeLog 9646
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 06308d0d91be80561036160135ea2eea zope-2.7.2-r2.ebuild 3219
 MD5 ddddbf81a9803fef7474cb22df00a924 files/digest-zope-2.6.4-r1 64
@@ -14,7 +14,7 @@ MD5 4d278d26bb7be7693f7213861a9d3805 files/2.6.4/zope.initd 3791
 MD5 a18ddd3f2cdcb815cf86f4b9c4bdd6fe files/2.7.1/zope.confd 950
 MD5 8eed6ba044039a495f48e42555ee0893 files/2.7.1/zope.initd 1030
 MD5 68ed65ed913618858b8c3e298fbdf5a7 files/2.7.1/zdctl.patch 570
-MD5 a74f0aad59406bb1afe880b5a8816ab2 files/2.7.2/zope.initd 1320
+MD5 e99b9fc903db808c1bbb5aa8b9d0b44f files/2.7.2/zope.initd 1169
 MD5 bce3b7d98963ff6f3e3d53557f3b4912 files/2.7.2/gid.patch 460
-MD5 13d280cd815040d7f75424b5a70c83e8 files/2.7.3/zope.initd 1164
+MD5 998ccd16d3ca461a8d30d2f9a7d46d24 files/2.7.3/zope.initd 1240
 MD5 bce3b7d98963ff6f3e3d53557f3b4912 files/2.7.3/gid.patch 460
diff --git a/net-zope/zope/files/2.7.2/zope.initd b/net-zope/zope/files/2.7.2/zope.initd
index c4173e4e5ae5..f7bde1bcb606 100644
--- a/net-zope/zope/files/2.7.2/zope.initd
+++ b/net-zope/zope/files/2.7.2/zope.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/files/2.7.2/zope.initd,v 1.4 2004/09/28 01:46:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/files/2.7.2/zope.initd,v 1.5 2004/10/25 14:36:24 batlogg Exp $
 
-opts="start stop restart kill quit status help"
+opts="start stop reload kill quit status help"
 
 depend() {
         need net
@@ -21,13 +21,6 @@ stop() {
         eend $?
 }
 
-restart() {
-        ebegin "Restarting Zope in INSTANCE_HOME"
-        svc_stop
-	    svc_start
-        eend $?
-}
-
 kill() {
         ebegin "Killing Zope in INSTANCE_HOME"
         INSTANCE_HOME/bin/zopectl kill
@@ -41,9 +34,8 @@ quit() {
 }
 
 reload() {
-         # throws an error, dunno why
-        ebegin "Reloading Zope config in INSTANCE_HOME"
-        INSTANCE_HOME/bin/zopectl reload
+        ebegin "Restarting Zope config in INSTANCE_HOME"
+        INSTANCE_HOME/bin/zopectl restart
         eend $?
 }
 
diff --git a/net-zope/zope/files/2.7.3/zope.initd b/net-zope/zope/files/2.7.3/zope.initd
index 3df94f0e19bf..d825eaac98f1 100644
--- a/net-zope/zope/files/2.7.3/zope.initd
+++ b/net-zope/zope/files/2.7.3/zope.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/files/2.7.3/zope.initd,v 1.1 2004/10/25 07:27:13 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/files/2.7.3/zope.initd,v 1.2 2004/10/25 14:36:24 batlogg Exp $
 
-opts="start stop restart kill quit status help"
+opts="start stop reload kill quit status help"
 
 depend() {
         need net
@@ -21,7 +21,8 @@ stop() {
         eend $?
 }
 
-restart() {
+reload() {
+        # note: reload calls zope restart, runscript restart stops and starts
         ebegin "Restarting Zope in INSTANCE_HOME"
         INSTANCE_HOME/bin/zopectl restart
         eend $?