Commit 547b3335 authored by Dimitri Fontaine's avatar Dimitri Fontaine

Fix the `el-get-rmdir' error check logic, to fix #944 properly.

parent 529a2e1f
......@@ -147,8 +147,9 @@ entry."
(let* ((edir (expand-file-name el-get-dir))
(pdir (expand-file-name "." (el-get-package-directory package))))
;; check that we're all set
(unless (and (string= edir pdir) ; package is "", or such like
(string= edir (substring pdir 0 (length edir))))
(when (or (string= edir pdir) ; package is "", or such like
;; error if pdir is not a subdirectory of el-get-dir
(not (string= edir (substring pdir 0 (length edir)))))
(error "el-get-rmdir: directory '%s' of package '%s' is not inside `el-get-dir' ('%s')."
pdir package el-get-dir))
(cond ((file-symlink-p pdir)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment