Changeset 8e7c9fe in mainline for contrib/bazaar/bzreml/__init__.py

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• contrib/bazaar/bzreml/__init__.py (modified) (3 diffs)

contrib/bazaar/bzreml/__init__.py

@@ -40 +40 @@
 import smtplib
 import time
+import os
 
 from StringIO import StringIO
@@ -133 +134 @@
                                 revision_ac_no = branch.revision_id_to_revno(revision_ac_id)
                                 
+                                repo_name = os.path.basename(branch.base)
+                                if (repo_name == ''):
+                                        repo_name = os.path.basename(os.path.dirname(branch.base))
+                                
                                 committer = revision_ac.committer
                                 authors = revision_ac.get_apparent_authors()
                                 date = time.strftime("%Y-%m-%d %H:%M:%S %Z (%a, %d %b %Y)", time.localtime(revision_ac.timestamp))
+                                
+                                body.write("Repo: %s\n" % repo_name)
                                 
                                 if (authors != [committer]):
@@ -208 +215 @@
                                         tree_prev.unlock()
                                 
-                                subject = "r%d - %s" % (revision_ac_no, commit_message)
+                                subject = "[%s] r%d - %s" % (repo_name, revision_ac_no, commit_message)
                                 send_smtp("localhost", config_sender(config), config_to(config), subject, body.getvalue())