diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-25 06:38:05 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-25 06:38:05 +0200 |
| commit | 521354e4b328af321ee223a77339bc045c074d18 (patch) | |
| tree | 12d452f761a386b07f067e19374d11ef6fad4793 /source4/scripting/python/misc_wrap.c | |
| parent | 1b5acdb93b2febab2d26862a1cd2c7614d558478 (diff) | |
| parent | 74126bc6d0211a7674156dfda8ab13054b403a1d (diff) | |
| download | samba-521354e4b328af321ee223a77339bc045c074d18.tar.gz samba-521354e4b328af321ee223a77339bc045c074d18.tar.xz samba-521354e4b328af321ee223a77339bc045c074d18.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-pyirpc
(This used to be commit 0a9330ee2a38bff13bf9af48114e6eecd962680b)
Diffstat (limited to 'source4/scripting/python/misc_wrap.c')
| -rw-r--r-- | source4/scripting/python/misc_wrap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c index 8c57237e5b..888918ef53 100644 --- a/source4/scripting/python/misc_wrap.c +++ b/source4/scripting/python/misc_wrap.c @@ -2554,6 +2554,9 @@ static swig_module_info swig_module = {swig_types, 27, 0, 0, 0, 0}; #include "librpc/ndr/libndr.h" +#include "libcli/util/pyerrors.h" + + SWIGINTERN int SWIG_AsVal_double (PyObject *obj, double *val) { @@ -3046,8 +3049,7 @@ SWIGINTERN PyObject *_wrap_dsdb_attach_schema_from_ldif_file(PyObject *SWIGUNUSE "ldb context must be non-NULL"); result = dsdb_attach_schema_from_ldif_file(arg1,(char const *)arg2,(char const *)arg3); if (!W_ERROR_IS_OK(result)) { - PyObject *obj = Py_BuildValue((char *)"(i,s)", W_ERROR_V(result), win_errstr(result)); - PyErr_SetObject(PyExc_RuntimeError, obj); + PyErr_SetWERROR(result); SWIG_fail; } else if (resultobj == NULL) { resultobj = Py_None; |