[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha6-1203-g258ae4c
Jelmer Vernooij
jelmer at samba.org
Wed Feb 25 11:49:55 GMT 2009
The branch, master has been updated
via 258ae4cec596631b758fb17c170c4494e4db8a8e (commit)
via fff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf (commit)
via b9cf189404d5ef6b0a2440dc5f9670f0f6d0c131 (commit)
via dcb2e7d57718ebd3db75999819ec8ef507f9dd7b (commit)
via 10c047c6f4c0f6b9fdebbdf133a3bd72aa8776de (commit)
from a041d9061922b1a90e5b5047af77934d908afdd5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 258ae4cec596631b758fb17c170c4494e4db8a8e
Merge: fff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf a041d9061922b1a90e5b5047af77934d908afdd5
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Feb 25 12:49:37 2009 +0100
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts:
source4/scripting/python/samba/provision.py
commit fff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf
Merge: b9cf189404d5ef6b0a2440dc5f9670f0f6d0c131 1a9bb33a7db393aff970619f20490e755f0d282b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 24 01:02:45 2009 +0100
Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit b9cf189404d5ef6b0a2440dc5f9670f0f6d0c131
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 24 01:02:26 2009 +0100
expand tabs in python file, consistent with the rest of the file.
commit dcb2e7d57718ebd3db75999819ec8ef507f9dd7b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 24 01:00:09 2009 +0100
expand tabs in python file, consistent with the rest of the file.
commit 10c047c6f4c0f6b9fdebbdf133a3bd72aa8776de
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 24 00:58:29 2009 +0100
Fix finding of setup data.
-----------------------------------------------------------------------
Summary of changes:
source4/scripting/python/samba/__init__.py | 2 +-
source4/scripting/python/samba/provision.py | 4 ++--
source4/scripting/python/samba/samdb.py | 10 +++++-----
source4/scripting/python/samba/tests/__init__.py | 4 ++--
source4/scripting/python/samba/tests/provision.py | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index e9fc26a..a49e6e1 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -223,7 +223,7 @@ def check_all_substituted(text):
:param text: The text to search for substitution variables
"""
if not "${" in text:
- return
+ return
var_start = text.find("${")
var_end = text.find("}", var_start)
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index c817bff..0aa84ec 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -52,7 +52,7 @@ def find_setup_dir():
"""Find the setup directory used by provision."""
dirname = os.path.dirname(__file__)
if "/site-packages/" in dirname:
- prefix = dirname[:dirname.index("/site-packages/")]
+ prefix = "/".join(dirname[:dirname.index("/site-packages/")].split("/")[:-2])
for suffix in ["share/setup", "share/samba/setup", "setup"]:
ret = os.path.join(prefix, suffix)
if os.path.isdir(ret):
@@ -1368,7 +1368,7 @@ def provision_backend(setup_dir=None, message=None,
"MMRDN": names.domaindn,
"LDAPSERVER" : url,
"MMR_PASSWORD": mmr_pass })
- # olc = yes?
+ # olc = yes?
olc_config_pass = ""
olc_config_acl = ""
olc_syncrepl_config = ""
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 9cc55e5..614970d 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -201,11 +201,11 @@ userAccountControl: %u
glue.dsdb_attach_schema_from_ldif_file(self, pf, df)
def set_invocation_id(self, invocation_id):
- """Set the invocation id for this SamDB handle.
-
- :param invocation_id: GUID of the invocation id.
- """
- glue.dsdb_set_ntds_invocation_id(self, invocation_id)
+ """Set the invocation id for this SamDB handle.
+
+ :param invocation_id: GUID of the invocation id.
+ """
+ glue.dsdb_set_ntds_invocation_id(self, invocation_id)
def setexpiry(self, user, expiry_seconds, noexpiry):
"""Set the password expiry for a user
diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index d827bfa..b342b93 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -70,8 +70,8 @@ class SubstituteVarTestCase(unittest.TestCase):
samba.substitute_var("foo ${bla} gsff", {"bar": "bla"}))
def test_check_all_substituted(self):
- samba.check_all_substituted("nothing to see here")
- self.assertRaises(Exception, samba.check_all_substituted, "Not subsituted: ${FOOBAR}")
+ samba.check_all_substituted("nothing to see here")
+ self.assertRaises(Exception, samba.check_all_substituted, "Not subsituted: ${FOOBAR}")
class LdbExtensionTests(TestCaseInTempDir):
diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py
index 352357f..fdac9d4 100644
--- a/source4/scripting/python/samba/tests/provision.py
+++ b/source4/scripting/python/samba/tests/provision.py
@@ -56,7 +56,7 @@ class ProvisionTestCase(samba.tests.TestCaseInTempDir):
machinepass="machinepass", dnsdomain="example.com")
self.assertEquals(1,
len(secrets_ldb.search("samAccountName=krbtgt,flatname=EXAMPLE,CN=Principals")))
- self.assertEquals("keytab.path",
+ self.assertEquals("keytab.path",
secrets_ldb.searchone(basedn="flatname=EXAMPLE,CN=primary domains",
expression="(privateKeytab=*)",
attribute="privateKeytab"))
--
Samba Shared Repository
More information about the samba-cvs
mailing list