move message creation outside of exception

This commit is contained in:
Fábio Santos
2020-01-24 15:13:20 +00:00
parent 84999f590e
commit 2fb6b338bd
2 changed files with 21 additions and 26 deletions
+1 -25
View File
@@ -24,31 +24,7 @@ class ConfigError(DvcException):
class NoRemoteError(ConfigError):
def __init__(self, command, *, config=None):
has_any_remote = False
if config:
has_any_remote = bool(
config.list_options(
Config.SECTION_REMOTE_REGEX, Config.SECTION_REMOTE_URL
)
)
if has_any_remote:
msg = (
"no remote specified. Setup default remote with\n"
" dvc remote default <remote name>\n"
"or use:\n"
" dvc {} -r <remote name>".format(command)
)
else:
msg = (
"no remote specified. Create a remote with\n"
" dvc remote add <remote name> <remote url>\n"
"To create a default remote use the -d flag:\n"
" dvc remote add -d <remote name> <remote url>"
)
super().__init__(msg)
pass
def supported_cache_type(types):
+20 -1
View File
@@ -39,7 +39,26 @@ class DataCloud(object):
if remote:
return self._init_remote(remote)
raise NoRemoteError(command, config=self.repo.config)
has_non_default_remote = bool(
self.repo.config.list_options(
Config.SECTION_REMOTE_REGEX, Config.SECTION_REMOTE_URL
)
)
if has_non_default_remote:
error_msg = (
"no remote specified. Setup default remote with\n"
" dvc remote default <remote name>\n"
"or use:\n"
" dvc {} -r <remote name>".format(command)
)
else:
error_msg = (
"no remote specified. Create a default remote with\n"
" dvc remote add -d <remote name> <remote url>"
)
raise NoRemoteError(error_msg)
def _init_remote(self, remote):
return Remote(self.repo, name=remote)