(1) Display CVE details in editor when opening new bug

(2) Liaison update
(3) Allow adding liaison CCs to restricted bugs (disabled, broken in pybugz).


svn path=/; revision=663

3 files changed, 19 insertions, 14 deletions

diff --git a/bin/check-todo-issues b/bin/check-todo-issues
index 844648e..2113eb1 100755
--- a/bin/check-todo-issues
+++ b/bin/check-todo-issues
@@ -251,7 +251,7 @@ class EntryEditor:
         description = ""
 
         for cve in cvelist:
-            print cve
+            # print cve
             description += "%s (http://nvd.nist.gov/nvd.cfm?cvename=%s):\n" % (cve, cve)
             description += "%s" % self.cvedb.get_cve_desc(cve, indentation = 2)
             description += "\n\n"
@@ -259,6 +259,8 @@ class EntryEditor:
         import tempfile
         (fd, filename) = tempfile.mkstemp(suffix='.txt', prefix='gsec', text=True)
         os.write(fd, "%s\n" % (title))
+        os.write(fd, "\n== Only the first line is used as a title, comments follow ==\n")
+        os.write(fd, description)
         os.close(fd)
         os.spawnlp(os.P_WAIT, self.editor, self.editor, filename)
 
diff --git a/bin/liaisons.py b/bin/liaisons.py
index 00bc1b1..4047527 100644
--- a/bin/liaisons.py
+++ b/bin/liaisons.py
@@ -1,12 +1,12 @@
 liaisons = {
-	'alpha' : 'yoswink',
-	'amd64' : 'welp',
-	'hppa'  : 'jer',
-	'ppc'   : 'dertobi123',
-	'ppc64' : 'corsair',
-	'sparc' : 'fmccor',
-	'x86'   : 'tsunam',
-	'release': 'pva'
+	'alpha' : ['yoswink',    'armin76',   ],
+	'amd64' : ['keytoaster', 'tester', ],
+	'hppa'  : ['jer', ],
+	'ppc'   : ['dertobi123', ],
+	'ppc64' : ['corsair', ],
+	'sparc' : ['fmccor', ],
+	'x86'   : ['maekke', 'armin76', ],
+	'release': ['pva', ]
 }
 
 def get (arch):
diff --git a/bin/target b/bin/target
index 5c7d125..e273be1 100755
--- a/bin/target
+++ b/bin/target
@@ -8,7 +8,7 @@ import string
 import sys
 import os
 
-cc_release = True
+cc_release = False
 
 def print_targets(version, liaisons, prestable, bugno, username):
     keywords = os.popen('adjutrix --log-level silent -k').readlines()
@@ -80,8 +80,8 @@ def print_targets(version, liaisons, prestable, bugno, username):
             liaison = liaisons.get(arch)
             if not liaison:
                 continue
-            output.append(" %7s : %s" % (arch, liaison))
-            mails.append("%s@gentoo.org" % (liaison))
+            output.append(" %7s : %s" % (arch, ', '.join(liaison)))
+            mails.extend("%s@gentoo.org" % (l,) for l in liaison)
     elif missing_keywords:
         # not in liaison mode and missing keywords exist
         mails = ["%s@gentoo.org" % (mail) for mail in missing_keywords]
@@ -91,9 +91,9 @@ def print_targets(version, liaisons, prestable, bugno, username):
         cc_add = listsort(mails, ',')
         print "\nCC: %s" % (cc_add)
         if bugno:
-            cc_arches_to(bugno, username, message, mails)
+            cc_arches_to(bugno, username, message, mails, liaisons)
 
-def cc_arches_to(bugno, username, message, cc_add):
+def cc_arches_to(bugno, username, message, cc_add, auth):
     try:
         import bugz
         import re
@@ -104,6 +104,9 @@ def cc_arches_to(bugno, username, message, cc_add):
         user = username,
         password = None,
         forget = False)
+    if auth:
+        pass
+        # bz.auth()
     bug_xml = bz.get(bugno)
     if not bug_xml:
         print "Could not find bug %s" % (bugno)