diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-12-14 22:23:55 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-12-15 09:02:17 +0100 |
| commit | 653b513181824f1aae76e6cad0a6a00b4456f6e1 (patch) | |
| tree | a61eec989560e906914715d09a88134925c06b37 /solenv | |
| parent | 98de1ed2e2c49ea52f398f666aef7480b60e4e3c (diff) | |
clang-format: restore lost warning on touching formatted file without check
Consistently only assign something to $clang_format if it's a good
version, and also consistently return undef if we found no good version.
Change-Id: Iadbbb56a5c15dfaeec5c80e3cc8fcc78b787c04b
Reviewed-on: https://gerrit.libreoffice.org/46489
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/clang-format/ClangFormat.pm | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/solenv/clang-format/ClangFormat.pm b/solenv/clang-format/ClangFormat.pm index 024fe7c1f87f..5aba53fd285c 100644 --- a/solenv/clang-format/ClangFormat.pm +++ b/solenv/clang-format/ClangFormat.pm @@ -65,24 +65,27 @@ sub find() { my $version = get_wanted_version(); my $opt_lo = get_own_directory(); - my $clang_format = $ENV{CLANG_FORMAT}; - if (!(defined($clang_format) && is_matching_clang_format_version($clang_format, $version))) + my $clang_format; + if (!(defined($ENV{CLANG_FORMAT}) && is_matching_clang_format_version($ENV{CLANG_FORMAT}, $version))) { - $clang_format = "$opt_lo/clang-format"; - if (!is_matching_clang_format_version($clang_format, $version)) + my @dirs = split /:/, $ENV{PATH}; + unshift(@dirs, $opt_lo); + + foreach my $dir (@dirs) { - foreach my $dir (split /:/, $ENV{PATH}) + if (is_matching_clang_format_version("$dir/clang-format", $version)) { - if (is_matching_clang_format_version("$dir/clang-format", $version)) - { - $clang_format = "$dir/clang-format"; - last; - } + $clang_format = "$dir/clang-format"; + last; } } } + else + { + $clang_format = $ENV{CLANG_FORMAT}; + } - if ($^O eq "cygwin") + if ($^O eq "cygwin" && defined($clang_format)) { $clang_format = `cygpath -m '$clang_format'`; chomp $clang_format; |