From 18f0ca0d92496c1030029b415275231019bb2276 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Fri, 24 Aug 2018 13:23:25 +0300 Subject: [PATCH 1/2] dependency: only use rel_path for local deps Fixes #1048 Signed-off-by: Ruslan Kuprieiev --- dvc/dependency/base.py | 6 +++++- tests/test_repro.py | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dvc/dependency/base.py b/dvc/dependency/base.py index 96f37a60f..970fc540a 100644 --- a/dvc/dependency/base.py +++ b/dvc/dependency/base.py @@ -59,7 +59,11 @@ class DependencyBase(object): def status(self): if self.changed(): # FIXME better msgs - return {self.rel_path: 'changed'} + if self.path_info['scheme'] == 'local': + p = self.rel_path + else: + p = self.path + return {p: 'changed'} return {} def save(self): diff --git a/tests/test_repro.py b/tests/test_repro.py index ad5147cea..f5af30043 100644 --- a/tests/test_repro.py +++ b/tests/test_repro.py @@ -380,6 +380,8 @@ class TestReproExternalBase(TestDvc): sleep() + self.dvc.status() + stages = self.dvc.reproduce(import_stage.path) self.assertEqual(len(stages), 1) self.assertTrue(os.path.exists('import')) From 9579cb79287b52bc73c6ba2f99f671009e2f5ea2 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Fri, 24 Aug 2018 14:33:32 +0300 Subject: [PATCH 2/2] config: fix ConfigError Signed-off-by: Ruslan Kuprieiev --- dvc/config.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dvc/config.py b/dvc/config.py index 18f5ddd61..352065fe3 100644 --- a/dvc/config.py +++ b/dvc/config.py @@ -10,8 +10,9 @@ from dvc.exceptions import DvcException class ConfigError(DvcException): """ DVC config exception """ - def __init__(self, ex=None): - super(ConfigError, self).__init__('Config file error', ex) + def __init__(self, msg, ex=None): + super(ConfigError, self).__init__('Config file error: {}'.format(msg), + ex) def supported_url(url):