Commit 95406ac9 authored by dgrogan@chromium.org's avatar dgrogan@chromium.org

trychange.py: make --sub_rep work again

It appears to have been broken in http://crrev.com/104148

BUG=102205

Review URL: http://codereview.chromium.org/9108030

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@116723 0039d316-1c4b-4281-b951-d872f2087c98
parent 7d654673
#!/usr/bin/env python
# Copyright (c) 2011 The Chromium Authors. All rights reserved.
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
......@@ -696,8 +696,10 @@ def TryChange(argv,
checkouts.append(GuessVCS(options, path, file_list))
checkouts[0].AutomagicalSettings()
for item in options.sub_rep:
checkout = GuessVCS(options, os.path.join(checkouts[0].checkout_root,
item), file_list)
# Pass file_list=None because we don't know the sub repo's file list.
checkout = GuessVCS(options,
os.path.join(checkouts[0].checkout_root, item),
None)
if checkout.checkout_root in [c.checkout_root for c in checkouts]:
parser.error('Specified the root %s two times.' %
checkout.checkout_root)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment