target: add STABLEREQ to bugs when cc'ing arches, correctly handle ebuild+ / upstream+

svn path=/; revision=1033

1 files changed, 8 insertions, 2 deletions

diff --git a/bin/target b/bin/target
index 2ce0af6..80510ad 100755
--- a/bin/target
+++ b/bin/target
@@ -114,7 +114,7 @@ def cc_arches_to(bugno, username, message, cc_add, auth):
     whiteboard = bug_xml.find('//status_whiteboard')
     if not whiteboard is None:
         whiteboard = whiteboard.text
-        new_whiteboard = re.sub("(ebuild|upstream|stable)\??", "stable", whiteboard)
+        new_whiteboard = re.sub("(ebuild\+?|upstream\+?|stable)\??", "stable", whiteboard)
         new_whiteboard = re.sub("stable/stable", "stable", new_whiteboard)
     else:
         whiteboard = "(empty)"
@@ -125,12 +125,18 @@ def cc_arches_to(bugno, username, message, cc_add, auth):
     else:
         print 'Setting whiteboard "%s" to "%s"' % (whiteboard, new_whiteboard)
     
+    keywords = bug_xml.find('//keywords')
+    if not keywords is None:
+        keywords = "%s %s" % (keywords.text, "STABLEREQ")
+    else:
+        keywords = "STABLEREQ"
+
     print "Go ahead? [y/n]: ",
 
     answer = sys.stdin.readline()
     if answer[0] == "y" or answer[0] == "Y":
         print "Modifying bug https://bugs.gentoo.org/%s ..." % (bugno),
-        if bz.modify(bugno, comment = message, add_cc = cc_add, whiteboard = new_whiteboard):
+        if bz.modify(bugno, comment = message, add_cc = cc_add, whiteboard = new_whiteboard, keywords = keywords):
             print "successful"
         else:
             print "error"