Merge branch 'master' of /mit/snippets

diff --git a/TracZephyrPlugin/ZephyrPlugin.py b/TracZephyrPlugin/ZephyrPlugin.py
index aeaec986f583dc3c9347892a966b34e33f4c4d0b..8daedd18102d71338c746c270071c6a024a71049 100644 (file)
--- a/TracZephyrPlugin/ZephyrPlugin.py
+++ b/TracZephyrPlugin/ZephyrPlugin.py
@@ -38,8 +38,12 @@ class ZephyrPlugin(Component):
         return '\n'.join(lines)
     
     def ticket_created(self, ticket):
-        message = "%s filed a new %s ticket:\n%s\n\n%s" % (ticket['reporter'],
+        ttype='ticket'
+        if ticket['type'] != 'defect':
+            ttype=ticket['type']
+        message = "%s filed a new %s %s:\n%s\n\n%s" % (ticket['reporter'],
                                                            ticket['priority'],
+                                                           ttype,
                                                            ticket['summary'],
                                                            self.format_text(ticket['description']))
         self.zwrite(ticket.id, message)