sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-13 08:23:49 +03:00
Code Activity

python: Add convenience function for getting command line loadparm context

Browse Source 
and default to using system smb.conf.
This commit is contained in:
Jelmer Vernooij
2008-01-23 23:33:36 +01:00
parent ffd793bbde
commit b3afde0f00
6 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/setup/upgrade.py
View File

@@ -14,7 +14,8 @@ import samba.getopt as options
from auth import system_session
parser = optparse.OptionParser("upgrade [options] <libdir> <smbconf>")
parser.add_option_group(options.SambaOptions(parser))
sambaopts = options.SambaOptions(parser)
parser.add_option_group(sambaopts)
parser.add_option_group(options.VersionOptions(parser))
credopts = options.CredentialsOptions(parser)
parser.add_option_group(credopts)
@@ -59,15 +60,13 @@ if setup_dir is None:
setup_dir = "setup"
creds = credopts.get_credentials()
lp = param.LoadParm()
if opts.configfile:
lp.load(opts.configfile)
lp = sambaopts.get_loadparm()
if opts.targetdir is not None:
if not os.path.exists(opts.targetdir):
os.mkdir(opts.targetdir)
lp.set("private dir", os.path.abspath(opts.targetdir))
lp.set("lock dir", os.path.abspath(opts.targetdir))
paths = provision_paths_from_lp(lp, "")
paths.smbconf = opts.configfile
paths.smbconf = sambaopts.get_loadparm_path()
upgrade_provision(samba3, setup_dir, message, credentials=creds, session_info=system_session(),
lp=lp, paths=paths)