[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[ddkilzer at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 89ebda1644810df7c496edbd6c84fee1f9aca0f8
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 25 22:02:38 2009 +0000

            <http://webkit.org/b/29718> mark-bug-fixed: add -u|--update-only switch
    
            Reviewed by Eric Seidel.
    
            * Scripts/mark-bug-fixed:
            (MarkBugFixed.__init__): Added -u|--update-only switch to list
            of parse options.
            (MarkBugFixed.main): When -u|--update-only is specified, add a
            comment to the bug without marking it Resolved/Fixed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48772 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1d870e6..a2ee849 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-09-25  David Kilzer  <ddkilzer at apple.com>
+
+        <http://webkit.org/b/29718> mark-bug-fixed: add -u|--update-only switch
+
+        Reviewed by Eric Seidel.
+
+        * Scripts/mark-bug-fixed:
+        (MarkBugFixed.__init__): Added -u|--update-only switch to list
+        of parse options.
+        (MarkBugFixed.main): When -u|--update-only is specified, add a
+        comment to the bug without marking it Resolved/Fixed.
+
 2009-09-25  Darin Adler  <darin at apple.com>
 
         Reviewed by Geoffrey Garen.
diff --git a/WebKitTools/Scripts/mark-bug-fixed b/WebKitTools/Scripts/mark-bug-fixed
index d3c3d92..a9ee944 100755
--- a/WebKitTools/Scripts/mark-bug-fixed
+++ b/WebKitTools/Scripts/mark-bug-fixed
@@ -44,6 +44,7 @@ class MarkBugFixedTool:
         self.option_parser = OptionParser(usage="usage: %prog [options] [rNNNNN]")
         self.option_parser.add_option("-b", "--bug-id", action="store", type="string", dest="bug_id", help="Specify bug id if no URL is provided in the commit log.")
         self.option_parser.add_option("-m", "--comment", action="store", type="string", dest="comment", help="Text to include in bug comment.")
+        self.option_parser.add_option("-u", "--update-only", action="store_true", default=False, dest="update_only", help="Add comment to the bug, but do not close it.")
 
     def scm(self):
         # Lazily initialize SCM to not error-out before command line parsing (or when running non-scm commands).
@@ -107,8 +108,12 @@ class MarkBugFixedTool:
         if options.comment:
             bug_comment = "%s\n\n%s" % (options.comment, bug_comment)
 
-        log("Updating Bug %s." % bug_id)
-        self.bugs.close_bug_as_fixed(bug_id, bug_comment)
+        if options.update_only:
+            log("Adding comment to Bug %s." % bug_id)
+            self.bugs.post_comment_to_bug(bug_id, bug_comment)
+        else:
+            log("Adding comment to Bug %s and marking as Resolved/Fixed." % bug_id)
+            self.bugs.close_bug_as_fixed(bug_id, bug_comment)
 
 
 def main():

-- 
WebKit Debian packaging