[Erp5-report] r29948 - in /experimental/erp5.buildout-zope-2.12/trunk: ./ patches/

[nobody at svn.erp5.org]

Author: leonardo
Date: Thu Oct 22 22:14:10 2009
New Revision: 29948

URL: http://svn.erp5.org?rev=29948&view=rev
Log:
use newly released itools, dispensing with its patch, and drop remaining timerserver reference

Removed:
    experimental/erp5.buildout-zope-2.12/trunk/patches/PyErr_Format-to-PyErr_SetString.patch
Modified:
    experimental/erp5.buildout-zope-2.12/trunk/base.cfg

Modified: experimental/erp5.buildout-zope-2.12/trunk/base.cfg
URL: http://svn.erp5.org/experimental/erp5.buildout-zope-2.12/trunk/base.cfg?rev=29948&r1=29947&r2=29948&view=diff
==============================================================================
--- experimental/erp5.buildout-zope-2.12/trunk/base.cfg [utf8] (original)
+++ experimental/erp5.buildout-zope-2.12/trunk/base.cfg [utf8] Thu Oct 22 22:14:10 2009
@@ -63,7 +63,6 @@
     erp5diff
     mechanize
     ClientForm
-    timerserver
     numpy
     ipython
 
@@ -150,21 +149,24 @@
 # along
 [itools]
 recipe = hexagonit.recipe.download
-url = http://download.hforge.org/itools/0.50/itools-0.50.7.tar.gz
+pkgname = itools-0.50.8
+url = http://download.hforge.org/itools/0.50/${:pkgname}.tar.gz
 
 [itools-build]
 recipe = collective.recipe.cmd
 lib = ${itools:location}/lib
+bin = ${itools:location}/bin
+source = ${itools:location}/${itools:pkgname}
 on_install = True
 on_update = false
 
 cmds =
-    cd ${itools:location}/itools-0.50.7
+    cd ${:source}
     patch -N -p1 < ${buildout:directory}/patches/PyErr_Format-to-PyErr_SetString.patch
-    env CFLAGS="$(pkg-config glib-2.0 --cflags-only-I)" ${buildout:executable} setup.py install --install-lib=${:lib} --install-scripts=${itools:location}/bin
+    env CFLAGS="$(pkg-config glib-2.0 --cflags-only-I)" ${buildout:executable} setup.py install --install-lib=${:lib} --install-scripts=${:bin}
 
 uninstall_cmds =
-    cd ${itools:location}/itools-0.50.7
+    cd ${:source}
     ${buildout:executable} setup.py clean
-    patch -R -p1 < ${buildout:directory}/patches/PyErr_Format-to-PyErr_SetString.patch
-    rm -rf ${itools:location}/{lib,bin}
+    rm -rf ${:lib} ${:bin}
+

Removed: experimental/erp5.buildout-zope-2.12/trunk/patches/PyErr_Format-to-PyErr_SetString.patch
URL: http://svn.erp5.org/experimental/erp5.buildout-zope-2.12/trunk/patches/PyErr_Format-to-PyErr_SetString.patch?rev=29947&view=auto
==============================================================================
--- experimental/erp5.buildout-zope-2.12/trunk/patches/PyErr_Format-to-PyErr_SetString.patch [utf8] (original)
+++ experimental/erp5.buildout-zope-2.12/trunk/patches/PyErr_Format-to-PyErr_SetString.patch (removed)
@@ -1,13 +1,0 @@
-diff --git a/xml/pyparser.c b/xml/pyparser.c
-index 897c34d..6a066ea 100644
---- a/xml/pyparser.c
-+++ b/xml/pyparser.c
-@@ -97,7 +97,7 @@ PyDocType_init (PyDocType * self, PyObject * args, PyObject * kwds)
-   doctype = doctype_new (PubidLiteral, SystemLiteral, intSubset, &error_msg);
-   if (!doctype)
-     {
--      PyErr_Format (XMLError, error_msg);
-+      PyErr_SetString (XMLError, error_msg);
-       return -1;
-     }
-   self->doctype = doctype;