From 459b7fad29eb408a8b3ac67a9c4034b18e3b6b64 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Mon, 17 Jun 2019 22:18:39 +0300 Subject: [PATCH] dvc: use realpath-ed paths consistently Fixes #2127 --- dvc/repo/init.py | 2 +- dvc/scm/git/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dvc/repo/init.py b/dvc/repo/init.py index ab4fb723a..ad03ad0b6 100644 --- a/dvc/repo/init.py +++ b/dvc/repo/init.py @@ -59,7 +59,7 @@ def init(root_dir=os.curdir, no_scm=False, force=False): Raises: KeyError: Raises an exception. """ - root_dir = os.path.abspath(root_dir) + root_dir = os.path.realpath(root_dir) dvc_dir = os.path.join(root_dir, Repo.DVC_DIR) scm = SCM(root_dir) if isinstance(scm, NoSCM) and not no_scm: diff --git a/dvc/scm/git/__init__.py b/dvc/scm/git/__init__.py index 62dfa5dbb..38c9022ff 100644 --- a/dvc/scm/git/__init__.py +++ b/dvc/scm/git/__init__.py @@ -42,10 +42,10 @@ class Git(Base): from git.exc import InvalidGitRepositoryError try: - self.git = git.Repo(root_dir) + self.git = git.Repo(self.root_dir) except InvalidGitRepositoryError: msg = "{} is not a git repository" - raise SCMError(msg.format(root_dir)) + raise SCMError(msg.format(self.root_dir)) # NOTE: fixing LD_LIBRARY_PATH for binary built by PyInstaller. # http://pyinstaller.readthedocs.io/en/stable/runtime-information.html