Skip to content

Commit

Permalink
Merge pull request #455 from tautschnig/433-follow-up
Browse files Browse the repository at this point in the history
Remove explicit "python" as cpplint.py is executable
  • Loading branch information
Daniel Kroening authored Jan 18, 2017
2 parents c2d7554 + 3ceecf6 commit 896d523
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .githooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ do
stagedFiles="$stagedFiles $tmpStaging/$file"
done

output=$(cd $gitRoot; python scripts/cpplint.py $stagedFiles 2>&1)
output=$(cd $gitRoot; scripts/cpplint.py $stagedFiles 2>&1)
retval=$?

if [ $retval -ne 0 ]
Expand Down
2 changes: 1 addition & 1 deletion scripts/run_lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ for file in $diff_files; do
# Run the linting script and filter by the filter we've build
# of all the modified lines
# The errors from the linter go to STDERR so must be redirected to STDOUT
result=`python $script_folder/cpplint.py $file 2>&1 | { grep -E "$lint_grep_filter" || true; }`
result=`$script_folder/cpplint.py $file 2>&1 | { grep -E "$lint_grep_filter" || true; }`

# Providing some errors were relevant we print them out
if [ "$result" ]
Expand Down

0 comments on commit 896d523

Please sign in to comment.