X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=blobdiff_plain;f=source4%2Fsetup%2Fupgrade;h=3d1316949f729e11567d33f9eb0b8fcd46b786f1;hp=9c1a0cfce819b56b7e0d6cdb7c27b95f09559106;hb=53b59aa2cf78d465f471916c7fae60b9f212840b;hpb=ddb4db7c65db202d71785a404622a4d6f1c3906a diff --git a/source4/setup/upgrade b/source4/setup/upgrade index 9c1a0cfce81..3d1316949f7 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