Merge pull request #1137 from efiop/master

local: use is_local property
This commit is contained in:
Ruslan Kuprieiev
2018-09-19 22:01:46 +03:00
committed by GitHub
2 changed files with 7 additions and 5 deletions
+7 -1
View File
@@ -41,6 +41,12 @@ class DependencyLOCAL(DependencyBase):
def __str__(self):
return self.rel_path
@property
def is_local(self):
assert os.path.isabs(self.path)
assert os.path.isabs(self.project.root_dir)
return self.path.startswith(self.project.root_dir)
@property
def sep(self):
return os.sep
@@ -71,7 +77,7 @@ class DependencyLOCAL(DependencyBase):
self.info = self.remote.save_info(self.path_info)
def dumpd(self):
if self.path.startswith(self.stage.project.root_dir):
if self.is_local:
path = self.remote.unixpath(os.path.relpath(self.path,
self.stage.cwd))
else:
-4
View File
@@ -40,10 +40,6 @@ class OutputLOCAL(DependencyLOCAL):
def cache(self):
return self.project.cache.local.get(self.md5)
@property
def is_local(self):
return self.path.startswith(self.project.root_dir)
def dumpd(self):
ret = super(OutputLOCAL, self).dumpd()
ret[self.PARAM_CACHE] = self.use_cache