Author: jelmer Date: 2007-11-21 12:32:50 +0000 (Wed, 21 Nov 2007) New Revision: 26084
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26084 Log: Merge upstream. Modified: branches/4.0-python/ branches/4.0-python/source/librpc/config.mk branches/4.0-python/source/samba4-skip branches/4.0-python/source/scripting/swig/config.mk branches/4.0-python/source/selftest/samba4_tests.sh Changeset: Property changes on: branches/4.0-python ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:ancestry:v3-trunk0 ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/4.0-python/source/librpc/config.mk =================================================================== --- branches/4.0-python/source/librpc/config.mk 2007-11-21 12:32:44 UTC (rev 26083) +++ branches/4.0-python/source/librpc/config.mk 2007-11-21 12:32:50 UTC (rev 26084) @@ -490,5 +490,3 @@ [PYTHON::swig_dcerpc] SWIG_FILE = rpc/dcerpc.i PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG dcerpc_samr RPC_NDR_LSA DYNCONFIG - - Modified: branches/4.0-python/source/samba4-skip =================================================================== --- branches/4.0-python/source/samba4-skip 2007-11-21 12:32:44 UTC (rev 26083) +++ branches/4.0-python/source/samba4-skip 2007-11-21 12:32:50 UTC (rev 26084) @@ -50,3 +50,4 @@ WINBIND # FIXME: This should not be skipped NSS-TEST # Fails samba4.ldb.python # Fails to link properly +samba4.credentials.python # Fails to link properly Modified: branches/4.0-python/source/scripting/swig/config.mk =================================================================== --- branches/4.0-python/source/scripting/swig/config.mk 2007-11-21 12:32:44 UTC (rev 26083) +++ branches/4.0-python/source/scripting/swig/config.mk 2007-11-21 12:32:50 UTC (rev 26084) @@ -12,7 +12,6 @@ @echo "Removing SWIG output files" @-rm -f scripting/swig/tdb.pyc scripting/swig/tdb.py - PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py pydoctor:: Modified: branches/4.0-python/source/selftest/samba4_tests.sh =================================================================== --- branches/4.0-python/source/selftest/samba4_tests.sh 2007-11-21 12:32:44 UTC (rev 26083) +++ branches/4.0-python/source/selftest/samba4_tests.sh 2007-11-21 12:32:50 UTC (rev 26084) @@ -305,4 +305,5 @@ then plantest "ldb.python" none PYTHONPATH=bin/python trial lib/ldb/tests/python/api.py plantest "credentials.python" none PYTHONPATH=bin/python trial auth/credentials/tests/bindings.py + plantest "registry.python" none PYTHONPATH=bin/python trial lib/registry/tests/bindings.py fi
