From 8da0390c57267710db1d08488a45f02338c9081b Mon Sep 17 00:00:00 2001 From: Alexander Schepanovski Date: Fri, 22 Nov 2019 12:58:08 +0100 Subject: [PATCH] remote: small .save_info()/.get_checksum() cleanup --- dvc/output/base.py | 7 +------ dvc/remote/base.py | 5 +++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dvc/output/base.py b/dvc/output/base.py index 120489d19..8344f1f3d 100644 --- a/dvc/output/base.py +++ b/dvc/output/base.py @@ -170,12 +170,7 @@ class OutputBase(object): return self.remote.exists(self.path_info) def changed_checksum(self): - return ( - self.checksum - != self.remote.save_info(self.path_info)[ - self.remote.PARAM_CHECKSUM - ] - ) + return self.checksum != self.remote.get_checksum(self.path_info) def changed_cache(self): if not self.use_cache or not self.checksum: diff --git a/dvc/remote/base.py b/dvc/remote/base.py index 011b0af4a..10969250a 100644 --- a/dvc/remote/base.py +++ b/dvc/remote/base.py @@ -293,6 +293,8 @@ class RemoteBASE(object): return checksum.endswith(cls.CHECKSUM_DIR_SUFFIX) def get_checksum(self, path_info): + assert path_info.scheme == self.scheme + if not self.exists(path_info): return None @@ -322,7 +324,6 @@ class RemoteBASE(object): return checksum def save_info(self, path_info): - assert path_info.scheme == self.scheme return {self.PARAM_CHECKSUM: self.get_checksum(path_info)} def changed(self, path_info, checksum_info): @@ -363,7 +364,7 @@ class RemoteBASE(object): ) return True - actual = self.save_info(path_info)[self.PARAM_CHECKSUM] + actual = self.get_checksum(path_info) if checksum != actual: logger.debug( "checksum '{}'(actual '{}') for '{}' has changed.".format(