Bug 1469378 - Update feed daemon to only manage subscribers on a revision if the...

diff --git a/extensions/PhabBugz/lib/Feed.pm b/extensions/PhabBugz/lib/Feed.pm
index 9fb1dac11f8569e2aad26b6e0b9ff0cc148a39e3..72829f179ce75c628aadf7df2a6fcef653a03ead 100644 (file)
--- a/extensions/PhabBugz/lib/Feed.pm
+++ b/extensions/PhabBugz/lib/Feed.pm
@@ -412,12 +412,12 @@ sub process_revision_change {
                 INFO("Creating new custom policy: " . join(", ", @$set_project_names));
                 $revision->make_private($set_project_names);
             }
-        }
 
-        # Subscriber list of the private revision should always match
-        # the bug roles such as assignee, qa contact, and cc members.
-        my $subscribers = get_bug_role_phids($bug);
-        $revision->set_subscribers($subscribers);
+            # Subscriber list of the private revision should always match
+            # the bug roles such as assignee, qa contact, and cc members.
+            my $subscribers = get_bug_role_phids($bug);
+            $revision->set_subscribers($subscribers);
+        }
     }
 
     my ($timestamp) = Bugzilla->dbh->selectrow_array("SELECT NOW()");

diff --git a/extensions/Push/lib/Connector/Phabricator.pm b/extensions/Push/lib/Connector/Phabricator.pm
index 5d5e4e63966132ac32eb0ebdb62391cf0489f0b7..e59ba6c0d1791e18a5dd221dfdf9fa08aa2d8b48 100644 (file)
--- a/extensions/Push/lib/Connector/Phabricator.pm
+++ b/extensions/Push/lib/Connector/Phabricator.pm
@@ -108,13 +108,15 @@ sub send {
 
         # Subscriber list of the private revision should always match
         # the bug roles such as assignee, qa contact, and cc members.
-        Bugzilla->audit(sprintf(
-          'Updating subscribers for %s for bug %s',
-          $revision->id,
-          $bug->id
-        ));
-        my $subscribers = get_bug_role_phids($bug);
-        $revision->set_subscribers($subscribers) if $subscribers;
+        if (!$is_public) {
+            Bugzilla->audit(sprintf(
+              'Updating subscribers for %s for bug %s',
+              $revision->id,
+              $bug->id
+            ));
+            my $subscribers = get_bug_role_phids($bug);
+            $revision->set_subscribers($subscribers) if $subscribers;
+        }
 
         $revision->update();
     }