[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

["Sebastian Pipping" <sping@gentoo.org>]

commit:     911dc4f105485bf5778f1cd1a52ad4e1221abbda
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 28 09:27:20 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Mar 28 09:27:20 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=911dc4f1

Redundant remove_symlinks removed.

svn path=/emacs-extra/eselect-emacs/; revision=181

---
 ChangeLog     |    2 ++
 emacs.eselect |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 44474dd..14aeecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,3 +52,5 @@ Version 0.5 (24 Mar 2007)
 	Brought do_set and do_update more in line.
 	Check for root in do_set and do_update.
 	env.eselect seems to be buggy; use env-update instead.
+	Redundant remove_symlinks removed.
+Version 0.6 (28 Mar 2007)

diff --git a/emacs.eselect b/emacs.eselect
index 3f6d7af..544bba7 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
-		remove_symlinks || die -q "Couldn't remove existing symlink"
+		true
 	elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then
 		die -q "Sorry, ${ROOT}/usr/bin/emacs confuses me"
 	fi
@@ -210,7 +210,6 @@ 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