summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-02-11 17:13:42 +1100
committerAndrew Bartlett <abartlet@samba.org>2010-02-11 17:16:55 +1100
commit5a2ff4d16f67a2617a3b54e30900e5b4825d6617 (patch)
tree394685ae70d4392fa83688b843ebac820b3aa730
parent0f0229c45473dd58d633fe6a98865db9aeff1e0e (diff)
downloadsamba-5a2ff4d16f67a2617a3b54e30900e5b4825d6617.tar.gz
samba-5a2ff4d16f67a2617a3b54e30900e5b4825d6617.tar.bz2
samba-5a2ff4d16f67a2617a3b54e30900e5b4825d6617.zip
s4:provision Be more polite to long-suffering Samba testers.
Our testers put up with a lot of odd things when testing out Samba4. Andrew Bartlett
-rw-r--r--source4/scripting/python/samba/provision.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index b02d94d227..2ea46138d5 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1173,8 +1173,9 @@ def provision(setup_dir, message, session_info,
# only install a new smb.conf if there isn't one there already
if os.path.exists(smbconf):
- # JHT calls me up often enough with weird errors, because he
- # uses an empty smb.conf. --abartlet
+ # if Samba Team members can't figure out the weird errors
+ # loading an empty smb.conf gives, then we need to be smarter.
+ # Pretend it just didn't exist --abartlet
data = open(smbconf, 'r').read()
data = data.lstrip()
if data is None or data == "":