Let depot_tools use scripts from deps-pulled "script" folder.

Let depot_tools use scripts from deps-pulled "script" folder.

BUG=240309
TBR=iannucci@chromium.org

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=248420

[ncarter (slow), 2014-02-02 18:51:53]

LGTM
On Feb 2, 2014 9:58 AM, <thakis@chromium.org> wrote:

> Reviewers: ncarter,
>
> Description:
> Let depot_tools use scripts from deps-pulled "script" folder.
>
> BUG=240309
>
> Please review this at https://codereview.chromium.org/139693006/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/tools/
>
> Affected files (+6, -3 lines):
>   M     depot_tools/clang_format.py
>
>
> Index: depot_tools/clang_format.py
> ===================================================================
> --- depot_tools/clang_format.py (revision 248419)
> +++ depot_tools/clang_format.py (working copy)
> @@ -62,11 +62,14 @@
>
>  def FindClangFormatScriptInChromiumTree(script_name):
>    """Return a path to a clang-format helper script, or die trying."""
> -  # The binaries in platform-specific subdirectories in src/tools/gn/bin.
>    script_path = os.path.join(_FindChromiumTree(), 'src', 'third_party',
> -                             'clang_format', 'scripts', script_name)
> +                             'clang_format', 'script', script_name)
>    if not os.path.exists(script_path):
> -    raise NotFoundError('File does not exist: %s' % script_path)
> +    # TODO(thakis): Remove the fallback to the old location after a few
> weeks.
> +    script_path = os.path.join(_FindChromiumTree(), 'src', 'third_party',
> +                               'clang_format', 'scripts', script_name)
> +    if not os.path.exists(script_path):
> +      raise NotFoundError('File does not exist: %s' % script_path)
>    return script_path
>
>
>
>
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[Nico, 2014-02-02 18:58:26]

The CQ bit was checked by thakis@chromium.org

[commit-bot: I haz the power, 2014-02-02 18:58:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/139693006/10002

[commit-bot: I haz the power, 2014-02-02 19:00:16]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-02 19:00:16]

Presubmit check for 139693006-10002 failed and returned exit status 1.

Running presubmit commit checks ...
Checking out rietveld...
Running save-description-on-failure.sh
Running push-basic.sh
Running upstream.sh
Running submit-from-new-dir.sh
Running abandon.sh
Running submodule-merge-test.sh
Running upload-local-tracking-branch.sh
Running hooks.sh
Running post-dcommit-hook-test.sh
Running upload-stale.sh
Running patch.sh
Running basic.sh

** Presubmit ERRORS **
Missing LGTM from an OWNER for these files:
    depot_tools/clang_format.py

Presubmit checks took 102.9s to calculate.

[commit-bot: I haz the power, 2014-02-02 19:00:24]

CQ bit was unchecked on CL. Ignoring.

[commit-bot: I haz the power, 2014-02-02 19:00:24]

CQ bit was unchecked on CL. Ignoring.

[commit-bot: I haz the power, 2014-02-02 19:00:25]

CQ bit was unchecked on CL. Ignoring.

[Nico, 2014-02-02 19:01:40]

iannucci: TBR for depot_tools owners.

[Nico, 2014-02-02 19:01:44]

The CQ bit was checked by thakis@chromium.org

[commit-bot: I haz the power, 2014-02-02 19:01:49]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/139693006/10002

[commit-bot: I haz the power, 2014-02-02 19:03:20]

Change committed as 248420

[commit-bot: I haz the power, 2014-02-02 19:03:24]

CQ bit was unchecked on CL. Ignoring.

[commit-bot: I haz the power, 2014-02-02 19:03:24]

CQ bit was unchecked on CL. Ignoring.

[commit-bot: I haz the power, 2014-02-02 19:03:25]

CQ bit was unchecked on CL. Ignoring.