mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-08 17:49:17 +00:00
Code Activity

fix bug for #157

Browse Source
This commit is contained in:
deadc0de6
2019-06-10 20:36:58 +02:00
parent 9d0c30e633
commit 7bd5d7fd45
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dotdrop/updater.py
View File

@@ -93,13 +93,12 @@ class Updater:
new_path = self._apply_trans_w(path, dotfile) new_path = self._apply_trans_w(path, dotfile)
if not new_path: if not new_path:
return False return False
path = new_path if os.path.isdir(new_path):
if os.path.isdir(path): ret = self._handle_dir(new_path, dtpath)
ret = self._handle_dir(path, dtpath)
else: else:
ret = self._handle_file(path, dtpath) ret = self._handle_file(new_path, dtpath)
# clean temporary files # clean temporary files
if new_path and os.path.exists(new_path): if new_path != path and os.path.exists(new_path):
remove(new_path) remove(new_path)
return ret return ret

7
tests-ng/transformations.sh
View File

@@ -164,6 +164,13 @@ set -e
# test update # test update
########################### ###########################
# update single file
echo 'update' > ${tmpd}/def
cd ${ddpath} | ${bin} update -f -k -c ${cfg} -p p1 -b -V f_def
[ "$?" != "0" ] && exit 1
[ ! -e ${tmpd}/def ] && echo 'dotfile in FS removed' && exit 1
[ ! -e ${tmps}/dotfiles/def ] && echo 'dotfile in dotpath removed' && exit 1
# update single file # update single file
cd ${ddpath} | ${bin} update -f -k -c ${cfg} -p p1 -b -V f_abc cd ${ddpath} | ${bin} update -f -k -c ${cfg} -p p1 -b -V f_abc
[ "$?" != "0" ] && exit 1 [ "$?" != "0" ] && exit 1