From 4448ba595af2bbf388db979ef11c1bc2cae6e632 Mon Sep 17 00:00:00 2001 From: Jacob Hurwitz Date: Mon, 4 Feb 2013 14:19:43 -0500 Subject: [PATCH] Change our default format to be more descriptive This adds two characters to the length of our default format field, but based on a conversation I had with kcr, I think this should probably be okay. If it's a problem, the symptom we'll see is that certain people will be unable to send zephyrs with this default format (so, certain Humbug users will have their forwarding consistently fail). We need to remember to, in a future commit (once everyone has started using the updated version), remove the: > or notice.format.endswith("@(@color(blue))") (imported from commit 703ef60f524646bca8d5099c9066efabd365be43) --- bots/zephyr_mirror_backend.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/zephyr_mirror_backend.py b/bots/zephyr_mirror_backend.py index 3013016..60044b3 100755 --- a/bots/zephyr_mirror_backend.py +++ b/bots/zephyr_mirror_backend.py @@ -285,7 +285,7 @@ def process_notice(notice, log): logger.debug("Skipping ... %s/%s/%s" % (zephyr_class, notice.instance, is_personal)) return - if notice.format.endswith("@(@color(blue))"): + if notice.format.startswith("Zephyr error: See") or notice.format.endswith("@(@color(blue))"): logger.debug("Skipping message we got from Humbug!") return @@ -441,7 +441,7 @@ def forward_to_zephyr(message): wrapped_content = "\n".join("\n".join(wrapper.wrap(line)) for line in message["content"].split("\n")) - zwrite_args = ["zwrite", "-n", "-s", zsig_fullname, "-F", "http://zephyr.1ts.org/wiki/df @(@color(blue))"] + zwrite_args = ["zwrite", "-n", "-s", zsig_fullname, "-F", "Zephyr error: See http://zephyr.1ts.org/wiki/df"] if message['type'] == "stream": zephyr_class = message["display_recipient"] instance = message["subject"]