[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Wed Feb 10 23:18:45 MST 2010
The branch, master has been updated
via 5a2ff4d... s4:provision Be more polite to long-suffering Samba testers.
from 0f0229c... Fix unused variable warning after change to new DLINK macros.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5a2ff4d16f67a2617a3b54e30900e5b4825d6617
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 11 17:13:42 2010 +1100
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
-----------------------------------------------------------------------
Summary of changes:
source4/scripting/python/samba/provision.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index b02d94d..2ea4613 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 == "":
--
Samba Shared Repository
More information about the samba-cvs
mailing list