diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-11 18:44:57 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-11 18:44:57 +0100 |
| commit | 53b59aa2cf78d465f471916c7fae60b9f212840b (patch) | |
| tree | 5d18794de63923fc72603ecd5f0dff4c62380b61 /source4/setup/upgrade | |
| parent | ddb4db7c65db202d71785a404622a4d6f1c3906a (diff) | |
| download | samba-53b59aa2cf78d465f471916c7fae60b9f212840b.tar.gz samba-53b59aa2cf78d465f471916c7fae60b9f212840b.tar.bz2 samba-53b59aa2cf78d465f471916c7fae60b9f212840b.zip | |
Use convenience function for finding setup_dir based on location of
python module.
Diffstat (limited to 'source4/setup/upgrade')
| -rwxr-xr-x | source4/setup/upgrade | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/setup/upgrade b/source4/setup/upgrade index 9c1a0cfce8..3d1316949f 100755 --- a/source4/setup/upgrade +++ b/source4/setup/upgrade @@ -65,13 +65,14 @@ else: smbconf = os.path.join(libdir, "smb.conf") samba3 = Samba3(libdir, smbconf) +from samba.provision import find_setup_dir from samba.upgrade import upgrade_provision message("Provisioning\n") setup_dir = opts.setupdir if setup_dir is None: - setup_dir = os.path.dirname(__file__) + setup_dir = find_setup_dir() lp = sambaopts.get_loadparm() smbconf = lp.configfile |