sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-29 15:42:04 +03:00
Code Activity

r26596: Fixed upgrade.py.

Browse Source 
Added blackbox tests for provision and upgrade Python scripts.
Clean up temporary files created by the Python tests.
(This used to be commit 2227fb6df6)
This commit is contained in:
Jelmer Vernooij
2007-12-25 16:36:44 -06:00
committed by Stefan Metzmacher
parent cea31e3216
commit 533cc583ed
11 changed files with 68 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source4/scripting/python/samba/provision.py
View File

@ -95,7 +95,7 @@ def setup_add_ldif(ldb, ldif_path, subst_vars=None):
assert "${" not in data
ldb.load_ldif_add(data)
ldb.add_ldif(data)
def setup_modify_ldif(ldb, ldif_path, substvars=None):
@ -140,7 +140,7 @@ def setup_file(template, fname, substvars):
open(f, 'w').write(data)
def provision_default_paths(lp, dnsdomain):
def provision_paths_from_lp(lp, dnsdomain):
"""Set the default paths for provisioning.
:param lp: Loadparm context.
@ -605,7 +605,7 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
realm = lp.get("realm")
else:
if lp.get("realm").upper() != realm.upper():
raise Error("realm '%s' in smb.conf must match chosen realm '%s'\n" %
raise Exception("realm '%s' in smb.conf must match chosen realm '%s'\n" %
(lp.get("realm"), realm))
assert realm is not None