Bug 85798 - zodb-3.3 ebuild is missing a patch
|
Bug#:
85798
|
Product: Gentoo Linux
|
Version: unspecified
|
Platform: All
|
|
OS/Version: Linux
|
Status: RESOLVED
|
Severity: normal
|
Priority: P2
|
|
Resolution: FIXED
|
Assigned To: net-zope@gentoo.org
|
Reported By: zaai@spaaij.net
|
|
Component: Development
|
|
|
URL:
|
|
Summary: zodb-3.3 ebuild is missing a patch
|
|
Keywords:
|
|
Status Whiteboard:
|
|
Opened: 2005-03-18 09:54 0000
|
zodb-3.3.final has a bug in zdctl. As a result, running a zeo server using
zdctl will fail because it tries to pass the umask option without a parameter.
The 'umask' option is missing a parameter.
Around line 219:
args += self._get_override("-m", "umask")
Should be:
args += self._get_override("-m", "umask", oct(self.options.umask))
Or, simply comment it out (is it for 3.2 compatibility only?):
# args += self._get_override("-m", "umask")
The ZODB wiki has a patch for this,
http://www.zope.org/Collectors/Zope/1323
Reproducible: Always
Steps to Reproduce:
1. install zodb-3.3
2. run: zdctl.py -p 'runzeo.py -f test -a 9999' start
Error: invalid value for -m '18': invalid literal for int(): 18
For help, use /usr/bin/zdrun.py -h
Actual Results:
zdctl.py -p 'runzeo.py -f test -a 9999' start
Error: invalid value for -m '18': invalid literal for int(): 18
For help, use /usr/bin/zdrun.py -h
Expected Results:
It should run the zeo server without error messages.
^C terminates the process
Patch commited into portage. this should go upstream, but date on zodb
zollecter is almost year old, looks like no one will fix it at their side :(
patch is small, so i decided to put it into tree. This was done _without_
version bump, so please do emerge sync followed by emerge zodb.
thank you for your information.
Just tested the new ebuild and it works fine.
Thanks for fixing this.
Slightly off-topic, but can you please add the ~amd64 keywords to the ebuilds?
ZODB-3.2.5 and ZODB-3.3 both work fine on amd64.
please follow bug http://bugs.gentoo.org/show_bug.cgi?id=86949 i filled for
you. As i have access only to x86, i cannot add amd64 keyword. Would be very
nice if you can file some bugs for other packages _working_ on your amd64.
Created an attachment (id=54707) [details]
Updated patch with different line numbers
This patch replaces:
/usr/portage/net-zope/zodb/files/zodb-3.3_umaskbug.patch
Oddly enough the patch works on my amd64 box but not on the x86 box.
For some reason the line numbering of the original patch (posted on the zodb
bug collector) is slightly off. Attached an updated patch.
Can you please update portage?
Thanks,
Henk
this is strange, beacuse i prepared the patch personally (i mean headers) also
directoried to match package. also the patch applies cleanly on my x86
(otherwise i would commit it into portage).
Could You please paste error from emerge (especially output file, which is
mention on patch applying failure) ?
och, please do 'rm -rf /var/tmp/portage/zodb-3.3/' before emerge.
as for now, i did not update patch in portage.
Yeah I was a bit surprised as well, especially since it works fine on my amd64
box. Maybe it has to do with line endings or the patch fuzz factor?
Below the emerge error info. emerge was called after deleting
/var/tmp/portage/zodb-3.3/
# emerge zodb
Calculating dependencies ...done!
>>> emerge (1 of 1) net-zope/zodb-3.3 to /
>>> md5 src_uri ;-) ZODB3-3.3.tgz
>>> Unpacking source...
>>> Unpacking ZODB3-3.3.tgz to /var/tmp/portage/zodb-3.3/work
* Applying zodb-3.3_umaskbug.patch ...
* Failed Patch: zodb-3.3_umaskbug.patch !
* ( /usr/portage/net-zope/zodb/files/zodb-3.3_umaskbug.patch )
*
* Include in your bugreport the contents of:
*
* /var/tmp/portage/zodb-3.3/temp/zodb-3.3_umaskbug.patch-5472.out
!!! ERROR: net-zope/zodb-3.3 failed.
!!! Function epatch, Line 401, Exitcode 0
!!! Failed Patch: zodb-3.3_umaskbug.patch!
!!! If you need support, post the topmost build error, NOT this status message.
# cat /var/tmp/portage/zodb-3.3/temp/zodb-3.3_umaskbug.patch-5472.out
***** zodb-3.3_umaskbug.patch *****
===================================
PATCH COMMAND: patch -p0 -g0 <
/usr/portage/net-zope/zodb/files/zodb-3.3_umaskbug.patch
===================================
patching file Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py
Hunk #1 FAILED at 208.
1 out of 1 hunk FAILED -- saving rejects to file
Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py.rej
===================================
PATCH COMMAND: patch -p1 -g0 <
/usr/portage/net-zope/zodb/files/zodb-3.3_umaskbug.patch
===================================
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py.orig 2004-05-07
19:50:30.000000000 -0400
|+++ Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py 2004-05-07
19:50:51.000000000 -0400
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
===================================
PATCH COMMAND: patch -p2 -g0 <
/usr/portage/net-zope/zodb/files/zodb-3.3_umaskbug.patch
===================================
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py.orig 2004-05-07
19:50:30.000000000 -0400
|+++ Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py 2004-05-07
19:50:51.000000000 -0400
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
===================================
PATCH COMMAND: patch -p3 -g0 <
/usr/portage/net-zope/zodb/files/zodb-3.3_umaskbug.patch
===================================
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py.orig 2004-05-07
19:50:30.000000000 -0400
|+++ Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py 2004-05-07
19:50:51.000000000 -0400
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
===================================
PATCH COMMAND: patch -p4 -g0 <
/usr/portage/net-zope/zodb/files/zodb-3.3_umaskbug.patch
===================================
missing header for unified diff at line 3 of patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py.orig 2004-05-07
19:50:30.000000000 -0400
|+++ Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py 2004-05-07
19:50:51.000000000 -0400
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
could You please send me by email (radek@gentoo.org), three files:
/var/tmp/portage/zodb-3.3/.../Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py.rej
/var/tmp/portage/zodb-3.3/.../Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py
/usr/portage/net-zope/zodb/files/zodb-3.3_umaskbug.patch
its best to get it just after emerge failure.
also current patch version (-v) if its different than 2.5.9
Thanx for Henk Spaaij help i managed to correct patch in the portage. Please do
'emerge sync; rm -rf /var/tmp/zodb-3.3; emerge -av =net-zope/zodb-3.3' to
emerge newest version (no version bump).