Skip to content

py3: use links from os module #3090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from Jan 11, 2020
Merged

py3: use links from os module #3090

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5bee24
py3: use links from os module
Jan 8, 2020
6eac40d
system: catch OSError instead of Exception
Jan 10, 2020
b8dd422
py3: fspath source and link_name
Jan 10, 2020
df97a2a
don't reimport DvcException
Jan 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 9 additions & 45 deletions dvc/system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import shutil

from dvc.compat import fspath
from dvc.exceptions import DvcException


logger = logging.getLogger(__name__)
Expand All @@ -21,55 +22,19 @@ def copy(src, dest):

@staticmethod
def hardlink(source, link_name):
import ctypes
from dvc.exceptions import DvcException

source, link_name = fspath(source), fspath(link_name)

if System.is_unix():
try:
os.link(source, link_name)
return
except Exception as exc:
raise DvcException("link") from exc

CreateHardLink = ctypes.windll.kernel32.CreateHardLinkW
CreateHardLink.argtypes = [
ctypes.c_wchar_p,
ctypes.c_wchar_p,
ctypes.c_void_p,
]
CreateHardLink.restype = ctypes.wintypes.BOOL

res = CreateHardLink(link_name, source, None)
if res == 0:
raise DvcException("CreateHardLinkW") from ctypes.WinError()
try:
os.link(source, link_name)
except OSError as exc:
raise DvcException("failed to link") from exc

@staticmethod
def symlink(source, link_name):
import ctypes
from dvc.exceptions import DvcException

source, link_name = fspath(source), fspath(link_name)

if System.is_unix():
try:
os.symlink(source, link_name)
return
except Exception as exc:
msg = "failed to symlink '{}' -> '{}': {}"
raise DvcException(msg.format(source, link_name, str(exc)))

flags = 0
if source is not None and os.path.isdir(source):
flags = 1

func = ctypes.windll.kernel32.CreateSymbolicLinkW
func.argtypes = (ctypes.c_wchar_p, ctypes.c_wchar_p, ctypes.c_uint32)
func.restype = ctypes.c_ubyte

if func(link_name, source, flags) == 0:
raise DvcException("CreateSymbolicLinkW") from ctypes.WinError()
try:
os.symlink(source, link_name)
except OSError as exc:
raise DvcException("failed to symlink") from exc

@staticmethod
def _reflink_darwin(src, dst):
Expand Down Expand Up @@ -126,7 +91,6 @@ def _reflink_linux(src, dst):
@staticmethod
def reflink(source, link_name):
import platform
from dvc.exceptions import DvcException

source, link_name = fspath(source), fspath(link_name)

Expand Down