diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2007-03-28 11:16:36 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2007-03-28 11:16:36 +0000 |
| commit | 42b3eda29ef6017a8016c46649bd234121fcdbc5 (patch) | |
| tree | faa7fcd1582a3ac622bfe44bc29a248cfa096e23 | |
| parent | Redundant remove_symlinks removed. (diff) | |
| download | emacs-tools-42b3eda29ef6017a8016c46649bd234121fcdbc5.tar.gz emacs-tools-42b3eda29ef6017a8016c46649bd234121fcdbc5.tar.bz2 emacs-tools-42b3eda29ef6017a8016c46649bd234121fcdbc5.zip | |
Undo changeset 181.
svn path=/emacs-extra/eselect-emacs/; revision=183
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | emacs.eselect | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -54,3 +54,5 @@ Version 0.5 (24 Mar 2007) env.eselect seems to be buggy; use env-update instead. Redundant remove_symlinks removed. Version 0.6 (28 Mar 2007) + 28 Mar 2007 + Undo previous change. diff --git a/emacs.eselect b/emacs.eselect index 544bba7..3f6d7af 100644 --- a/emacs.eselect +++ b/emacs.eselect @@ -184,7 +184,7 @@ do_set() { [[ -w "${ROOT}/usr/bin" ]] || die -q "You need to be root!" if [[ -L "${ROOT}/usr/bin/emacs" ]]; then - true + remove_symlinks || die -q "Couldn't remove existing symlink" elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then die -q "Sorry, ${ROOT}/usr/bin/emacs confuses me" fi @@ -210,6 +210,7 @@ do_update() { if [[ -L "${ROOT}/usr/bin/emacs" ]]; then [[ ${1} == "--if-unset" \ && -e "$(canonicalise ${ROOT}/usr/bin/emacs)" ]] && return + remove_symlinks || die -q "Couldn't remove existing symlink" elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then die -q "Sorry, ${ROOT}/usr/bin/emacs confuses me" fi |