Add support for arch liaisons

svn path=/; revision=162

2 files changed, 39 insertions, 5 deletions

diff --git a/bin/liaisons.py b/bin/liaisons.py
new file mode 100644
index 0000000..886f226
--- /dev/null
+++ b/bin/liaisons.py
@@ -0,0 +1,15 @@
+liaisons = {
+	'alpha' : 'ferdy',
+	'amd64' : 'welp',
+	'hppa'  : 'jer',
+	'ppc'   : 'dertobi123',
+	'ppc64' : 'corsair',
+	'sparc' : 'ferdy',
+	'x86'   : 'tsunam'
+}
+
+def get (arch):
+	if liaisons.has_key(arch):
+		return liaisons[arch]
+	else:
+		return None
diff --git a/bin/target b/bin/target
index 171005a..aff3019 100755
--- a/bin/target
+++ b/bin/target
@@ -8,7 +8,7 @@ import string
 import sys
 import os
 
-def print_targets(version):
+def print_targets(version, liaisons):
     keywords = os.popen('adjutrix --log-level silent -k').readlines()
     target_keywords = set()
     marker = 0
@@ -59,7 +59,23 @@ def print_targets(version):
         print 'Missing keywords: "%s"' % (missing_keywords_str)
 
     if missing_keywords:
-        print "\nCC: %s@gentoo.org" % (listsort(missing_keywords, '@gentoo.org,'))
+        if liaisons:
+            import liaisons
+            mails = []
+            print "\nAdding Arch Security Liaisons:"
+            archlist = list(missing_keywords)
+            archlist.sort()
+            for arch in archlist:
+                liaison = liaisons.get(arch)
+                if not liaison:
+                    continue
+                print " %6s : %s" % (arch, liaison)
+                mails.append(liaison)
+
+            print "\nCC: %s@gentoo.org" % (listsort(mails, '@gentoo.org,'))
+        else:
+            print "\nCC: %s@gentoo.org" % (listsort(missing_keywords, '@gentoo.org,'))
+
 
 def listsort(set, joinchar = ' '):
     mylist = list(set)
@@ -99,7 +115,7 @@ def get_arch(keywords, marker, column):
 
 def usage(programname):
     """ Print usage information """
-    print "Usage: %s [-v version] " % (programname)
+    print "Usage: %s [-v version] [-l] " % (programname)
     print '''
 This script prints target keywords for the latest ebuild in CWD, or version.
 '''
@@ -108,17 +124,20 @@ def main():
     import getopt
     try:
         optlist, list = getopt.getopt(sys.argv[1:],
-                                  'v:')
+                                  'v:l')
     except getopt.GetoptError:
         usage(sys.argv[0])
         sys.exit(2)
 
     version = None
+    liaisons = False
     for opt, arg in optlist:
         if opt == '-v':
             version = arg
+        if opt == '-l':
+            liaisons = True
 
-    print_targets(version)
+    print_targets(version, liaisons)
 
 
 if __name__ == "__main__":