Skip to content
This repository has been archived by the owner on Feb 4, 2020. It is now read-only.

Feature/add source dir #309

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/add source dir #309

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0740e39
adding a source base directory for people who have separate build and…
MikeRogers27 Apr 16, 2018
91b688c
fix indentation
MikeRogers27 Apr 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions clcache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,14 +942,14 @@ def collapseBasedirToPlaceholder(path):
else:
assert path == os.path.normcase(path)
if not baseDir is None:
assert baseDir == os.path.normcase(baseDir)
if path.startswith(baseDir):
assert baseDir == os.path.normcase(baseDir)
if path.startswith(baseDir):
return path.replace(baseDir, BASEDIR_REPLACEMENT, 1)
if not sourceDir is None:
assert sourceDir == os.path.normcase(sourceDir)
if path.startswith(sourceDir):
return path.replace(sourceDir, SOURCEDIR_REPLACEMENT, 1)
return path
return path
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code uses an indentation of four spaces per level. Let's stick to that format (if you like, you can merge this commit into the previous commit while you're at it).



def ensureDirectoryExists(path):
Expand Down