zephyr_mirror: Small logic fix in add_humbug_subscriptions.

(imported from commit bbcb7710310186612a8e7661a20b8b6558614758)
This commit is contained in:
Tim Abbott 2012-11-02 17:22:21 -04:00
parent e112db6702
commit eaf69717c1

View file

@ -426,6 +426,10 @@ def add_humbug_subscriptions(verbose):
zephyr_subscriptions.add(instance) zephyr_subscriptions.add(instance)
continue continue
elif cls == "mail" and instance == "inbox": 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 continue
elif instance != "*": elif instance != "*":
skipped.add((cls, instance, recipient, "Unsupported non-* instance")) skipped.add((cls, instance, recipient, "Unsupported non-* instance"))
@ -433,9 +437,6 @@ def add_humbug_subscriptions(verbose):
elif recipient != "*": elif recipient != "*":
skipped.add((cls, instance, recipient, "Unsupported non-* recipient.")) skipped.add((cls, instance, recipient, "Unsupported non-* recipient."))
continue continue
if len(cls) > 30:
skipped.add((cls, instance, recipient, "Class longer than 30 characters"))
continue
zephyr_subscriptions.add(cls) zephyr_subscriptions.add(cls)
if len(zephyr_subscriptions) != 0: if len(zephyr_subscriptions) != 0: