From eaf69717c1a9a1cc2dc6208731b6faac7263bb56 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Fri, 2 Nov 2012 17:22:21 -0400 Subject: [PATCH] zephyr_mirror: Small logic fix in add_humbug_subscriptions. (imported from commit bbcb7710310186612a8e7661a20b8b6558614758) --- bots/zephyr_mirror.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bots/zephyr_mirror.py b/bots/zephyr_mirror.py index 227d0fa..4e64c52 100755 --- a/bots/zephyr_mirror.py +++ b/bots/zephyr_mirror.py @@ -426,6 +426,10 @@ def add_humbug_subscriptions(verbose): zephyr_subscriptions.add(instance) continue elif cls == "mail" and instance == "inbox": + # We forward mail zephyrs, so no need to print a warning. + continue + elif len(cls) > 30: + skipped.add((cls, instance, recipient, "Class longer than 30 characters")) continue elif instance != "*": skipped.add((cls, instance, recipient, "Unsupported non-* instance")) @@ -433,9 +437,6 @@ def add_humbug_subscriptions(verbose): elif recipient != "*": skipped.add((cls, instance, recipient, "Unsupported non-* recipient.")) continue - if len(cls) > 30: - skipped.add((cls, instance, recipient, "Class longer than 30 characters")) - continue zephyr_subscriptions.add(cls) if len(zephyr_subscriptions) != 0: