diff options
Diffstat (limited to 'Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py b/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py index 1afa287de..58d497dc6 100644 --- a/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py +++ b/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py @@ -209,12 +209,10 @@ class BugzillaQueries(object): # Currently this returns all bugs across all components. # In the future we may wish to extend this API to construct more restricted searches. - def fetch_bugs_matching_search(self, search_string, author_email=None): + def fetch_bugs_matching_search(self, search_string): query = "buglist.cgi?query_format=advanced" if search_string: query += "&short_desc_type=allwordssubstr&short_desc=%s" % urllib.quote(search_string) - if author_email: - query += "&emailreporter1=1&emailtype1=substring&email1=%s" % urllib.quote(search_string) return self._fetch_bugs_from_advanced_query(query) def fetch_patches_from_pending_commit_list(self): @@ -515,10 +513,21 @@ class Bugzilla(object): self.authenticated = True self.username = username + # FIXME: Use enum instead of two booleans def _commit_queue_flag(self, mark_for_landing, mark_for_commit_queue): if mark_for_landing: + user = self.committers.account_by_email(self.username) + mark_for_commit_queue = True + if not user: + log("Your Bugzilla login is not listed in committers.py. Uploading with cq? instead of cq+") + mark_for_landing = False + elif not user.can_commit: + log("You're not a committer yet or haven't updated committers.py yet. Uploading with cq? instead of cq+") + mark_for_landing = False + + if mark_for_landing: return '+' - elif mark_for_commit_queue: + if mark_for_commit_queue: return '?' return 'X' |