Fix blame mail sending.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 13 Nov 2010 18:56:28 +0000 (19:56 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 13 Nov 2010 18:56:28 +0000 (19:56 +0100)
import-and-analyse.py
web/trees.conf

index ed854eca42a1ac515581661a97ee6653fdb5fb7d..8ce42b22356827430465bd34a5e83093a0cf49fb 100755 (executable)
@@ -45,7 +45,7 @@ def check_and_send_mails(tree, host, compiler, cur, old):
     recipients = set()
     change_log = ""
 
-    for rev in t.get_branch().log(from_rev=cur.rev, exclude_revs=set([old.rev])):
+    for rev in t.get_branch().log(from_rev=cur.revision, exclude_revs=set([old.revision])):
         recipients.add(rev.author)
         recipients.add(rev.committer)
         change_log += """
@@ -75,7 +75,7 @@ The build may have been broken by one of the following commits:
     msg = MIMEText(body)
     msg["Subject"] = "BUILD of %s:%s BROKEN on %s with %s AT REVISION %s" % (tree, t.branch, host, compiler, cur_rev)
     msg["From"] = "\"Build Farm\" <build@samba.org>"
-    msg["To"] = ",".join(recipients.keys())
+    msg["To"] = ",".join(recipients)
     if not opts.dry_run:
         smtp.send(msg["From"], [msg["To"]], msg.as_string())
     else:
@@ -121,7 +121,6 @@ for build in buildfarm.get_new_builds():
             if opts.verbose >= 1:
                 print "Previous build %s has disappeared" % prev_build
         else:
-            assert build.log_checksum() != prev_build.log_checksum()
             check_and_send_mails(build.tree, build.host, build.compiler, build, prev_build)
 
     if not opts.dry_run:
index 122bf4b4f5022c2ee88d19054f22a31bc0297683..1a725683798357c473c14b235b9a29b16c9e37da 100644 (file)
@@ -56,7 +56,7 @@ subdir = lib/talloc/
 
 [tdb]
 scm = git
-repo = /home/jelmer/tmp/release.git
+repo = samba.git
 branch = master
 subdir = lib/tdb/