[Pkg-zope-developers] Bug#331061: zope2.8: mkzeoinstance fails due to error in dpatch for mkzeoinst.py

[Stig Sandbeck Mathisen]

Package: zope2.8
Severity: important
Tags: patch

Patch is attached. 


*** zope2.8-2.8.1.mkzeoinst.patch.patch
--- zope2.8-2.8.1/debian/patches/zeo-mkzeoinst.dpatch.orig	2005-10-01 10:53:16.000000000 +0200
+++ zope2.8-2.8.1/debian/patches/zeo-mkzeoinst.dpatch	2005-10-01 10:52:31.000000000 +0200
@@ -8,8 +8,9 @@
 
 exit 0
 @DPATCH@
---- zope2.8-2.8.0//lib/python/ZEO/mkzeoinst.py	2005-07-13 17:58:51.761151024 +0200
-+++ zope2.8-2.8.0//lib/python/ZEO/mkzeoinst.py.debian	2005-07-13 18:02:13.431492472 +0200
+diff -urNad --exclude=CVS --exclude=.svn ./lib/python/ZEO/mkzeoinst.py /tmp/dpep-work.oHrBqX/zope2.8-2.8.1/lib/python/ZEO/mkzeoinst.py
+--- ./lib/python/ZEO/mkzeoinst.py	2005-08-11 07:12:58.000000000 +0200
++++ /tmp/dpep-work.oHrBqX/zope2.8-2.8.1/lib/python/ZEO/mkzeoinst.py	2005-10-01 10:45:16.000000000 +0200
 @@ -14,7 +14,7 @@
  ##############################################################################
  """%(program)s -- create a ZEO instance.
@@ -19,15 +20,16 @@
  
  Given an "instance home directory" <home> and some configuration
  options (all of which have default values), create the following:
-@@ -45,6 +45,7 @@
+@@ -44,7 +44,7 @@
+ %%define INSTANCE %(instance_home)s
  
  <zeo>
-   address %(port)d
+-  address %(port)d
 +  address %(address)s
    read-only false
    invalidation-queue-size 100
    # pid-filename $INSTANCE/var/ZEO.pid
-@@ -142,9 +143,12 @@
+@@ -142,9 +142,12 @@
              print msg
              sys.exit()
          if len(args) not in [1, 2]:
@@ -41,7 +43,7 @@
          instance_home = args[0]
          if not os.path.isabs(instance_home):
              instance_home = os.path.abspath(instance_home)
-@@ -158,20 +162,26 @@
+@@ -158,20 +161,26 @@
              sys.exit(2)
  
          if args[1:]:


-- System Information:
Debian Release: 3.1
Architecture: i386 (i686)
Kernel: Linux 2.6.8-2-686-smp
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)