Support a configurable signature for zephyrs

[Scripts/git/.git] / TracZephyrPlugin / ZephyrPlugin.py

diff --git a/TracZephyrPlugin/ZephyrPlugin.py b/TracZephyrPlugin/ZephyrPlugin.py
index aeaec986f583dc3c9347892a966b34e33f4c4d0b..673c339b99dfd5eff8b2b571dfa855a5e6f83315 100644 (file)
--- a/TracZephyrPlugin/ZephyrPlugin.py
+++ b/TracZephyrPlugin/ZephyrPlugin.py
@@ -22,6 +22,9 @@ class ZephyrPlugin(Component):
         opcode = self.config.get('ZephyrPlugin', 'opcode')
         if opcode:
             command += ['-O', opcode]
+        signature = self.config.get('ZephyrPlugin', 'signature')
+        if signature:
+            command += ['-s', signature]
         p = subprocess.Popen(command +
                              ['-c', zclass,
                               '-i', 'trac-#%s' % id],
@@ -38,8 +41,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)