The branch, master has been updated via 4e1966d autobuild: send email failure if rebase fails via f2dc72e autobuild: add an extra blank line before the autobuild markers via a89331e s4: mark us as not supporting python3 yet from 4ad6440 dsdb: Build more modules as shared objects.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 4e1966db9500c6834cbc0be70a745326b9257070 Author: Andrew Tridgell <tri...@samba.org> Date: Tue Oct 12 13:06:43 2010 +1100 autobuild: send email failure if rebase fails users need to know if the rebase on master fails Pair-Programmed-With: Andrew Bartlett <abart...@samba.org> Autobuild-User: Andrew Tridgell <tri...@samba.org> Autobuild-Date: Tue Oct 12 02:53:15 UTC 2010 on sn-devel-104 commit f2dc72eb47c0a3217265784f1d76117279ca8c1c Author: Andrew Tridgell <tri...@samba.org> Date: Tue Oct 12 13:06:16 2010 +1100 autobuild: add an extra blank line before the autobuild markers commit a89331e95480b049fa1feb314d210bc650c04494 Author: Andrew Tridgell <tri...@samba.org> Date: Tue Oct 12 13:05:36 2010 +1100 s4: mark us as not supporting python3 yet python3 works fine with waf fine, but our C interfaces need 2.x for now ----------------------------------------------------------------------- Summary of changes: script/autobuild.py | 25 ++++++++++++++++--------- script/commit_mark.sh | 1 + source4/wscript | 5 ++++- 3 files changed, 21 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/script/autobuild.py b/script/autobuild.py index fe0c1e2..6691437 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -341,15 +341,18 @@ Your autobuild failed when trying to test %s with the following error: the autobuild has been abandoned. Please fix the error and resubmit. +A summary of the autobuild process is here: + + http://git.samba.org/%s/samba-autobuild/autobuild.log +''' % (failed_task, errstr, user) + + if failed_task != 'rebase': + text += ''' You can see logs of the failed task here: http://git.samba.org/%s/samba-autobuild/%s.stdout http://git.samba.org/%s/samba-autobuild/%s.stderr -A summary of the autobuild process is here: - - http://git.samba.org/%s/samba-autobuild/autobuild.log - or you can get full logs of all tasks in this job here: http://git.samba.org/%s/samba-autobuild/logs.tar.gz @@ -358,7 +361,7 @@ The top commit for the tree that was built was: %s -''' % (failed_task, errstr, user, failed_tag, user, failed_tag, user, user, top_commit_msg) +''' % (user, failed_tag, user, failed_tag, user, top_commit_msg) msg = MIMEText(text) msg['Subject'] = 'autobuild failure for task %s during %s' % (failed_task, failed_stage) msg['From'] = 'autobu...@samba.org' @@ -442,10 +445,14 @@ while True: raise try: - if options.rebase is not None: - rebase_tree(options.rebase) - elif options.rebase_master: - rebase_tree(samba_master) + try: + if options.rebase is not None: + rebase_tree(options.rebase) + elif options.rebase_master: + rebase_tree(samba_master) + except: + email_failure(-1, 'rebase', 'rebase', 'rebase', 'rebase on master failed') + sys.exit(1) blist = buildlist(tasks, args) if options.tail: blist.start_tail() diff --git a/script/commit_mark.sh b/script/commit_mark.sh index bb1e942..93a345b 100755 --- a/script/commit_mark.sh +++ b/script/commit_mark.sh @@ -8,6 +8,7 @@ fi fullname=$(getent passwd $USER | cut -d: -f5| cut -d',' -f1) cat <<EOF >> "$1" + Autobuild-User: $fullname <$u...@samba.org> Autobuild-Date: $(date) on $(hostname) EOF diff --git a/source4/wscript b/source4/wscript index 806c58a..de84a09 100644 --- a/source4/wscript +++ b/source4/wscript @@ -8,7 +8,7 @@ VERSION=None import sys, os sys.path.insert(0, srcdir+"/buildtools/wafsamba") -import wafsamba, Options, samba_dist, Scripting +import wafsamba, Options, samba_dist, Scripting, Utils def load_version(have_git=False): @@ -93,6 +93,9 @@ def configure(conf): conf.check_python_version((2,4,2)) conf.check_python_headers(mandatory=True) + if int(conf.env['PYTHON_VERSION'][0]) >= 3: + raise Utils.WafError('Python version 3.x is not supported by Samba yet') + conf.RECURSE('dynconfig') conf.RECURSE('scripting/python') conf.RECURSE('lib/ldb') -- Samba Shared Repository