From 53b59aa2cf78d465f471916c7fae60b9f212840b Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 11 Feb 2009 18:44:57 +0100 Subject: Use convenience function for finding setup_dir based on location of python module. --- source4/setup/upgrade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/setup/upgrade') 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 -- cgit