Re: [SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-93-g09ac816

2009-03-03 Thread Stefan (metze) Metzmacher 
Jelmer Vernooij schrieb:
 On Mon, 2009-03-02 at 08:44 +0100, Stefan (metze) Metzmacher wrote:
 Jelmer Vernooij schrieb:
 The branch, master has been updated
via  09ac816b36e45fd537af2f7fe7c57a11f5c744f5 (commit)
via  235244f4cc707130dd130afce88bde49606bd501 (commit)
   from  54bc27e9374742d37b1ed9012d1cfe8f5ace6d40 (commit)

 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


 - Log -
 commit 09ac816b36e45fd537af2f7fe7c57a11f5c744f5
 Merge: 235244f4cc707130dd130afce88bde49606bd501 
 54bc27e9374742d37b1ed9012d1cfe8f5ace6d40
 Author: Jelmer Vernooij jel...@samba.org
 Date:   Sun Mar 1 16:39:35 2009 +0100

 Merge branch 'master' of git://git.samba.org/samba into teventfix
 
 Conflicts:
 lib/tevent/pytevent.c

 commit 235244f4cc707130dd130afce88bde49606bd501
 Author: Jelmer Vernooij jel...@samba.org
 Date:   Sun Mar 1 16:38:07 2009 +0100

 Avoid using tevent_util.h, which won't be available if we use the system
 tevent.

 ---

 Summary of changes:
  lib/tevent/pytevent.c |4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


 Changeset truncated at 500 lines:

 diff --git a/lib/tevent/pytevent.c b/lib/tevent/pytevent.c
 index 3b45ba1..fe7e7e3 100644
 --- a/lib/tevent/pytevent.c
 +++ b/lib/tevent/pytevent.c
 @@ -29,7 +29,6 @@
  
  #include tevent.h
  #include stdbool.h
 -#include tevent_util.h
  
  typedef struct {
 PyObject_HEAD
 @@ -54,7 +53,8 @@ static PyObject *py_backend_list(PyObject *self)
  PyObject *ret;
  int i, len;
  
 -len = ev_str_list_length(backends);
 +for (len = 0; backends[len]; len++);
 +
  ret = PyList_New(len);
  for (i = 0; i  len; i++)
  PyList_SetItem(ret, i, PyString_FromString(backends[i]));

 I think we should include pytevent in the standalone build and don't
 build it when we use the system tevent library. (We should do that for
 all statndalone libraries)
 We already build pytevent in the standalone build, but only in case that
 Python is available. Should we make Python mandatory for building
 standalone TDB and tevent?

No, but we should require it when building samba with a system tevent
library.

metze



signature.asc
Description: OpenPGP digital signature

Re: [SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-93-g09ac816

2009-03-02 Thread Jelmer Vernooij 
On Mon, 2009-03-02 at 08:44 +0100, Stefan (metze) Metzmacher wrote:
 Jelmer Vernooij schrieb:
  The branch, master has been updated
 via  09ac816b36e45fd537af2f7fe7c57a11f5c744f5 (commit)
 via  235244f4cc707130dd130afce88bde49606bd501 (commit)
from  54bc27e9374742d37b1ed9012d1cfe8f5ace6d40 (commit)
  
  http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
  
  
  - Log -
  commit 09ac816b36e45fd537af2f7fe7c57a11f5c744f5
  Merge: 235244f4cc707130dd130afce88bde49606bd501 
  54bc27e9374742d37b1ed9012d1cfe8f5ace6d40
  Author: Jelmer Vernooij jel...@samba.org
  Date:   Sun Mar 1 16:39:35 2009 +0100
  
  Merge branch 'master' of git://git.samba.org/samba into teventfix
  
  Conflicts:
  lib/tevent/pytevent.c
  
  commit 235244f4cc707130dd130afce88bde49606bd501
  Author: Jelmer Vernooij jel...@samba.org
  Date:   Sun Mar 1 16:38:07 2009 +0100
  
  Avoid using tevent_util.h, which won't be available if we use the system
  tevent.
  
  ---
  
  Summary of changes:
   lib/tevent/pytevent.c |4 ++--
   1 files changed, 2 insertions(+), 2 deletions(-)
  
  
  Changeset truncated at 500 lines:
  
  diff --git a/lib/tevent/pytevent.c b/lib/tevent/pytevent.c
  index 3b45ba1..fe7e7e3 100644
  --- a/lib/tevent/pytevent.c
  +++ b/lib/tevent/pytevent.c
  @@ -29,7 +29,6 @@
   
   #include tevent.h
   #include stdbool.h
  -#include tevent_util.h
   
   typedef struct {
  PyObject_HEAD
  @@ -54,7 +53,8 @@ static PyObject *py_backend_list(PyObject *self)
   PyObject *ret;
   int i, len;
   
  -len = ev_str_list_length(backends);
  +for (len = 0; backends[len]; len++);
  +
   ret = PyList_New(len);
   for (i = 0; i  len; i++)
   PyList_SetItem(ret, i, PyString_FromString(backends[i]));
  
 
 I think we should include pytevent in the standalone build and don't
 build it when we use the system tevent library. (We should do that for
 all statndalone libraries)
We already build pytevent in the standalone build, but only in case that
Python is available. Should we make Python mandatory for building
standalone TDB and tevent?

Cheers,

Jelmer

-- 
Jelmer Vernooij jel...@samba.org - http://samba.org/~jelmer/
Jabber: jel...@jabber.fsfe.org



signature.asc
Description: This is a digitally signed message part

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-93-g09ac816

2009-03-01 Thread Jelmer Vernooij 
The branch, master has been updated
   via  09ac816b36e45fd537af2f7fe7c57a11f5c744f5 (commit)
   via  235244f4cc707130dd130afce88bde49606bd501 (commit)
  from  54bc27e9374742d37b1ed9012d1cfe8f5ace6d40 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 09ac816b36e45fd537af2f7fe7c57a11f5c744f5
Merge: 235244f4cc707130dd130afce88bde49606bd501 
54bc27e9374742d37b1ed9012d1cfe8f5ace6d40
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 1 16:39:35 2009 +0100

Merge branch 'master' of git://git.samba.org/samba into teventfix

Conflicts:
lib/tevent/pytevent.c

commit 235244f4cc707130dd130afce88bde49606bd501
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 1 16:38:07 2009 +0100

Avoid using tevent_util.h, which won't be available if we use the system
tevent.

---

Summary of changes:
 lib/tevent/pytevent.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tevent/pytevent.c b/lib/tevent/pytevent.c
index 3b45ba1..fe7e7e3 100644
--- a/lib/tevent/pytevent.c
+++ b/lib/tevent/pytevent.c
@@ -29,7 +29,6 @@
 
 #include tevent.h
 #include stdbool.h
-#include tevent_util.h
 
 typedef struct {
PyObject_HEAD
@@ -54,7 +53,8 @@ static PyObject *py_backend_list(PyObject *self)
 PyObject *ret;
 int i, len;
 
-len = ev_str_list_length(backends);
+for (len = 0; backends[len]; len++);
+
 ret = PyList_New(len);
 for (i = 0; i  len; i++)
 PyList_SetItem(ret, i, PyString_FromString(backends[i]));


-- 
Samba Shared Repository

Re: [SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-93-g09ac816

2009-03-01 Thread Stefan (metze) Metzmacher 
Jelmer Vernooij schrieb:
 The branch, master has been updated
via  09ac816b36e45fd537af2f7fe7c57a11f5c744f5 (commit)
via  235244f4cc707130dd130afce88bde49606bd501 (commit)
   from  54bc27e9374742d37b1ed9012d1cfe8f5ace6d40 (commit)
 
 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
 
 
 - Log -
 commit 09ac816b36e45fd537af2f7fe7c57a11f5c744f5
 Merge: 235244f4cc707130dd130afce88bde49606bd501 
 54bc27e9374742d37b1ed9012d1cfe8f5ace6d40
 Author: Jelmer Vernooij jel...@samba.org
 Date:   Sun Mar 1 16:39:35 2009 +0100
 
 Merge branch 'master' of git://git.samba.org/samba into teventfix
 
 Conflicts:
   lib/tevent/pytevent.c
 
 commit 235244f4cc707130dd130afce88bde49606bd501
 Author: Jelmer Vernooij jel...@samba.org
 Date:   Sun Mar 1 16:38:07 2009 +0100
 
 Avoid using tevent_util.h, which won't be available if we use the system
 tevent.
 
 ---
 
 Summary of changes:
  lib/tevent/pytevent.c |4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 
 Changeset truncated at 500 lines:
 
 diff --git a/lib/tevent/pytevent.c b/lib/tevent/pytevent.c
 index 3b45ba1..fe7e7e3 100644
 --- a/lib/tevent/pytevent.c
 +++ b/lib/tevent/pytevent.c
 @@ -29,7 +29,6 @@
  
  #include tevent.h
  #include stdbool.h
 -#include tevent_util.h
  
  typedef struct {
   PyObject_HEAD
 @@ -54,7 +53,8 @@ static PyObject *py_backend_list(PyObject *self)
  PyObject *ret;
  int i, len;
  
 -len = ev_str_list_length(backends);
 +for (len = 0; backends[len]; len++);
 +
  ret = PyList_New(len);
  for (i = 0; i  len; i++)
  PyList_SetItem(ret, i, PyString_FromString(backends[i]));
 

I think we should include pytevent in the standalone build and don't
build it when we use the system tevent library. (We should do that for
all statndalone libraries)

metze




signature.asc
Description: OpenPGP digital signature