mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-10 14:29:15 +00:00
Code Activity

fix symlink loop for #45

Browse Source
This commit is contained in:
deadc0de6
2018-06-08 22:33:11 +02:00
parent 6c6304e339
commit 1b3ce007bc
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dotdrop/dotdrop.py
View File

@@ -214,6 +214,10 @@ def update(opts, conf, path):
src_clean = src src_clean = src
if os.path.isdir(src): if os.path.isdir(src):
src_clean = os.path.join(src, '..') src_clean = os.path.join(src, '..')
if os.path.samefile(src_clean, path):
# symlink loop
Log.err('dotfile points to itself: {}'.format(path))
return False
cmd = ['cp', '-R', '-L', os.path.expanduser(path), src_clean] cmd = ['cp', '-R', '-L', os.path.expanduser(path), src_clean]
if opts['dry']: if opts['dry']:
LOG.dry('would run: {}'.format(' '.join(cmd))) LOG.dry('would run: {}'.format(' '.join(cmd)))

8
dotdrop/installer.py
View File

@@ -32,6 +32,10 @@ class Installer:
"""install the src to dst using a template""" """install the src to dst using a template"""
src = os.path.join(self.base, os.path.expanduser(src)) src = os.path.join(self.base, os.path.expanduser(src))
dst = os.path.join(self.base, os.path.expanduser(dst)) dst = os.path.join(self.base, os.path.expanduser(dst))
if os.path.samefile(src, dst):
# symlink loop
self.log.err('dotfile points to itself: {}'.format(dst))
return []
self.log.dbg('install {} to {}'.format(src, dst)) self.log.dbg('install {} to {}'.format(src, dst))
if os.path.isdir(src): if os.path.isdir(src):
return self._handle_dir(templater, profile, src, dst) return self._handle_dir(templater, profile, src, dst)
@@ -72,6 +76,10 @@ class Installer:
def _handle_file(self, templater, profile, src, dst): def _handle_file(self, templater, profile, src, dst):
"""install src to dst when is a file""" """install src to dst when is a file"""
self.log.dbg('generate template for {}'.format(src)) self.log.dbg('generate template for {}'.format(src))
if os.path.samefile(src, dst):
# symlink loop
self.log.err('dotfile points to itself: {}'.format(dst))
return []
content = templater.generate(src, profile) content = templater.generate(src, profile)
if content is None: if content is None:
self.log.err('generate from template \"{}\"'.format(src)) self.log.err('generate from template \"{}\"'.format(src))