Title: [174092] trunk/Tools
Revision
174092
Author
a...@apple.com
Date
2014-09-29 16:08:07 -0700 (Mon, 29 Sep 2014)

Log Message

A small change to EWS bubble text. Explain why there are messages for ineligible patches.

Rubber-stamped by Tim Horton.

* QueueStatusServer/app.yaml:
* QueueStatusServer/handlers/statusbubble.py:
(StatusBubble._build_bubble):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (174091 => 174092)


--- trunk/Tools/ChangeLog	2014-09-29 22:38:15 UTC (rev 174091)
+++ trunk/Tools/ChangeLog	2014-09-29 23:08:07 UTC (rev 174092)
@@ -1,5 +1,15 @@
 2014-09-29  Alexey Proskuryakov  <a...@apple.com>
 
+        A small change to EWS bubble text. Explain why there are messages for ineligible patches.
+
+        Rubber-stamped by Tim Horton.
+
+        * QueueStatusServer/app.yaml:
+        * QueueStatusServer/handlers/statusbubble.py:
+        (StatusBubble._build_bubble):
+
+2014-09-29  Alexey Proskuryakov  <a...@apple.com>
+
         Typo fix, suggested by Tim Horton.
 
         * QueueStatusServer/handlers/statusbubble.py:

Modified: trunk/Tools/QueueStatusServer/app.yaml (174091 => 174092)


--- trunk/Tools/QueueStatusServer/app.yaml	2014-09-29 22:38:15 UTC (rev 174091)
+++ trunk/Tools/QueueStatusServer/app.yaml	2014-09-29 23:08:07 UTC (rev 174092)
@@ -1,5 +1,5 @@
 application: webkit-queues
-version: 174088 # Bugzilla bug ID of last major change
+version: 174192 # Bugzilla bug ID of last major change
 runtime: python
 api_version: 1
 

Modified: trunk/Tools/QueueStatusServer/handlers/statusbubble.py (174091 => 174092)


--- trunk/Tools/QueueStatusServer/handlers/statusbubble.py	2014-09-29 22:38:15 UTC (rev 174091)
+++ trunk/Tools/QueueStatusServer/handlers/statusbubble.py	2014-09-29 23:08:07 UTC (rev 174092)
@@ -139,7 +139,11 @@
                 bubble["state"] = "none"
                 bubble["details_message"] = "The patch is no longer eligible for processing."
                 if len(statuses) > 1:
-                    bubble["details_message"] += " Recent messages:\n\n" + "\n".join([status.message for status in statuses[1:]]) + "\n\n" + self._iso_time(statuses[0].date)
+                    if len(statuses) == 2:
+                        bubble["details_message"] += " One message was logged while the patch was still eligible:\n\n"
+                    else:
+                        bubble["details_message"] += " Some messages were logged while the patch was still eligible:\n\n"
+                    bubble["details_message"] += "\n".join([status.message for status in statuses[1:]]) + "\n\n" + self._iso_time(statuses[0].date)
             elif statuses[0].message == "Error: " + queue.name() + " unable to apply patch.":
                 bubble["state"] = "fail"
                 bubble["details_message"] = statuses[1].message + "\n\n" + self._iso_time(statuses[0].date)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to