Merge pull request #290 from google/revert-289-gh-pages

Revert "cpplint: Fix --root for non-subdirectories"
This commit is contained in:
Mark Mentovai 2017-11-08 13:18:12 -05:00 committed by GitHub
commit 66f0d44381
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

2
cpplint/cpplint.py vendored
View File

@ -1777,8 +1777,6 @@ def GetHeaderGuardCPPVariable(filename):
fileinfo = FileInfo(filename) fileinfo = FileInfo(filename)
file_path_from_root = fileinfo.RepositoryName() file_path_from_root = fileinfo.RepositoryName()
if _root: if _root:
file_path_from_root = fileinfo.FullName()
suffix = os.sep suffix = os.sep
# On Windows using directory separator will leave us with # On Windows using directory separator will leave us with
# "bogus escape error" unless we properly escape regex. # "bogus escape error" unless we properly escape regex.