From 47e1b421f5d4cd98ea27fb18b6706f79604d4f74 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Mon, 19 Jun 2017 19:20:04 -0700 Subject: [PATCH] Verify output refactoring. Attempt 2 --- dvc/command/import_file.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dvc/command/import_file.py b/dvc/command/import_file.py index 7d6a6a611..eca877bd4 100644 --- a/dvc/command/import_file.py +++ b/dvc/command/import_file.py @@ -65,7 +65,7 @@ class CmdImportFile(CmdBase): @staticmethod def verify_output(output, input): - if len(output) > 0 and output[-1] == os.path.sep and not os.path.isdir(output): + if output.is_dir_path(output) and not os.path.isdir(output): raise ImportFileError(u'Import error: output directory {} does not exist'.format(output)) if len(input) > 1 and not os.path.isdir(output): @@ -73,6 +73,10 @@ class CmdImportFile(CmdBase): raise ImportFileError(msg.format(output)) pass + @staticmethod + def is_dir_path(self, output): + return len(output) > 0 and output[-1] == os.path.sep + def import_and_commit_if_needed(self, input, output, lock=False, check_if_ready=True): if check_if_ready and not self.no_git_actions and not self.git.is_ready_to_go(): return 1