diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-03-07 19:20:39 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-03-07 19:20:39 +1100 |
| commit | a7e1fa0bef17ecc46f642b23ef635acfb09fea04 (patch) | |
| tree | b05c7bc9dd74f59f0da0d262f4fb8681c98d3d27 /source4/setup | |
| parent | 14c5f968e1f99ceabc5a42d9a38a00ea137b00ea (diff) | |
| download | samba-a7e1fa0bef17ecc46f642b23ef635acfb09fea04.tar.gz samba-a7e1fa0bef17ecc46f642b23ef635acfb09fea04.tar.bz2 samba-a7e1fa0bef17ecc46f642b23ef635acfb09fea04.zip | |
Try to fix up part of the upgrade test.
There are still problems with the upgrade test, but these are not
related to the provision system.
Andrew Bartlett
(This used to be commit d331bc400fb138bc43be88d0ca8ab3bcd590d2cd)
Diffstat (limited to 'source4/setup')
| -rwxr-xr-x | source4/setup/upgrade.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/source4/setup/upgrade.py b/source4/setup/upgrade.py index 960cd1b9e2..569b179544 100755 --- a/source4/setup/upgrade.py +++ b/source4/setup/upgrade.py @@ -50,7 +50,6 @@ else: samba3 = Samba3(libdir, smbconf) from samba.upgrade import upgrade_provision -from samba.provision import provision_paths_from_lp message("Provisioning\n") @@ -59,13 +58,6 @@ if setup_dir is None: setup_dir = "setup" creds = credopts.get_credentials() -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 = sambaopts.get_loadparm_path() + upgrade_provision(samba3, setup_dir, message, credentials=creds, session_info=system_session(), - lp=lp, paths=paths) + smbconf=sambaopts.get_loadparm_path(), targetdir=opts.targetdir) |