Comment out applying patchset dependencies in apply_issue.py

Context is in the internal chrome-infra thread here:
https://groups.google.com/a/google.com/d/msg/chrome-infra/dNQGjNoP-Dg/XDymPAwOCXkJ

NOPRESUBMIT=true

BUG=chromium:480453

Review URL: https://codereview.chromium.org/1194063003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295800 0039d316-1c4b-4281-b951-d872f2087c98
changes/01/332501/1
rmistry@google.com 10 years ago
parent d91b7e3ccb
commit 9c6a073ba2

@ -167,22 +167,27 @@ def main():
print('No patchset specified. Using patchset %d' % options.patchset) print('No patchset specified. Using patchset %d' % options.patchset)
issues_patchsets_to_apply = [(options.issue, options.patchset)] issues_patchsets_to_apply = [(options.issue, options.patchset)]
depends_on_info = obj.get_depends_on_patchset(options.issue, options.patchset)
while depends_on_info: # Temporary comment out the below while we try to figure out what to do with
depends_on_issue = int(depends_on_info['issue']) # patchset dependencies on trybots.
depends_on_patchset = int(depends_on_info['patchset']) # TODO(rmistry): Uncomment the below after a solution is found.
try: # depends_on_info = obj.get_depends_on_patchset(options.issue,
depends_on_info = obj.get_depends_on_patchset(depends_on_issue, # options.patchset)
depends_on_patchset) # while depends_on_info:
issues_patchsets_to_apply.insert(0, (depends_on_issue, # depends_on_issue = int(depends_on_info['issue'])
depends_on_patchset)) # depends_on_patchset = int(depends_on_info['patchset'])
except urllib2.HTTPError: # try:
print ('The patchset that was marked as a dependency no longer ' # depends_on_info = obj.get_depends_on_patchset(depends_on_issue,
'exists: %s/%d/#ps%d' % ( # depends_on_patchset)
options.server, depends_on_issue, depends_on_patchset)) # issues_patchsets_to_apply.insert(0, (depends_on_issue,
print 'Therefore it is likely that this patch will not apply cleanly.' # depends_on_patchset))
print # except urllib2.HTTPError:
depends_on_info = None # print ('The patchset that was marked as a dependency no longer '
# 'exists: %s/%d/#ps%d' % (
# options.server, depends_on_issue, depends_on_patchset))
# print 'Therefore it is likely that this patch will not apply cleanly.'
# print
# depends_on_info = None
num_issues_patchsets_to_apply = len(issues_patchsets_to_apply) num_issues_patchsets_to_apply = len(issues_patchsets_to_apply)
if num_issues_patchsets_to_apply > 1: if num_issues_patchsets_to_apply > 1:

Loading…
Cancel
Save