From d706ad280cb21781623cb08c0aeaa1d5f7445ab3 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sun, 26 Nov 2017 13:47:48 +0200 Subject: [PATCH] merge: just throw exception when can't load *state file Signed-off-by: Ruslan Kuprieiev --- dvc/command/merge.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dvc/command/merge.py b/dvc/command/merge.py index 55b9cd50a..e01f6ca36 100644 --- a/dvc/command/merge.py +++ b/dvc/command/merge.py @@ -10,7 +10,6 @@ from dvc.command.checkout import CmdCheckout from dvc.command.run import CommandFile - class CmdMerge(CmdBase): def __init__(self, settings): super(CmdMerge, self).__init__(settings) @@ -35,18 +34,9 @@ class CmdMerge(CmdBase): items = self.settings.path_factory.to_data_items(flist)[0] for item in items: - try: - state = StateFile.load(item, self.settings) - except Exception as ex: - Logger.error('Failed to load state file for {}'.format(item.data.relative), exc_info=True) - return None - + state = StateFile.load(item, self.settings) if isinstance(state.command, str): - try: - command = CommandFile.load(state.command) - except Exception as ex: - Logger.error('Failed to load command file for {}'.format(item.data.relative), exc_info=True) - return None + command = CommandFile.load(state.command) else: command = CommandFile.loadd(state.command)