summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexys Jacob <ultrabug@gentoo.org>2012-08-27 08:34:07 +0000
committerAlexys Jacob <ultrabug@gentoo.org>2012-08-27 08:34:07 +0000
commit0e48ac208e22140c4d44ae09948bfb3977769537 (patch)
tree6871409523e366ee9871cc3a0a0bd4da5168a7cb /www-servers/uwsgi
parentFix dependencies #427294 #432818 (diff)
downloadgentoo-2-0e48ac208e22140c4d44ae09948bfb3977769537.tar.gz
gentoo-2-0e48ac208e22140c4d44ae09948bfb3977769537.tar.bz2
gentoo-2-0e48ac208e22140c4d44ae09948bfb3977769537.zip
hard-code EDITOR in init scripts wrt #432606.
(Portage version: 2.1.11.10/cvs/Linux x86_64)
Diffstat (limited to 'www-servers/uwsgi')
-rw-r--r--www-servers/uwsgi/ChangeLog6
-rw-r--r--www-servers/uwsgi/files/uwsgi.initd4
-rw-r--r--www-servers/uwsgi/files/uwsgi.initd-r14
3 files changed, 9 insertions, 5 deletions
diff --git a/www-servers/uwsgi/ChangeLog b/www-servers/uwsgi/ChangeLog
index a956d491c194..8ca0b8d23e41 100644
--- a/www-servers/uwsgi/ChangeLog
+++ b/www-servers/uwsgi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/uwsgi
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.26 2012/08/14 08:33:01 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.27 2012/08/27 08:34:07 ultrabug Exp $
+
+ 27 Aug 2012; Ultrabug <ultrabug@gentoo.org> files/uwsgi.initd,
+ files/uwsgi.initd-r1:
+ hard-code EDITOR in init scripts wrt #432606.
*uwsgi-1.2.5 (14 Aug 2012)
diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd
index 3e6542e9f67c..ce0ba5724ab5 100644
--- a/www-servers/uwsgi/files/uwsgi.initd
+++ b/www-servers/uwsgi/files/uwsgi.initd
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.initd,v 1.2 2012/01/27 11:10:27 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.initd,v 1.3 2012/08/27 08:34:07 ultrabug Exp $
PROGNAME=${SVCNAME#*.}
@@ -25,7 +25,7 @@ start() {
eerror
eerror " ln -s uwsgi /etc/init.d/uwsgi.trac"
eerror " cp /etc/conf.d/uwsgi /etc/conf.d/uwsgi.trac"
- eerror " `basename "${EDITOR}"` /etc/conf.d/uwsgi.trac"
+ eerror " nano /etc/conf.d/uwsgi.trac"
eerror
return 1
fi
diff --git a/www-servers/uwsgi/files/uwsgi.initd-r1 b/www-servers/uwsgi/files/uwsgi.initd-r1
index 43529930f811..2ec3482e2d9e 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r1
+++ b/www-servers/uwsgi/files/uwsgi.initd-r1
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.initd-r1,v 1.4 2012/06/27 16:44:43 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.initd-r1,v 1.5 2012/08/27 08:34:07 ultrabug Exp $
PROGNAME=${SVCNAME#*.}
@@ -105,7 +105,7 @@ start() {
eerror
eerror " ln -s uwsgi /etc/init.d/uwsgi.trac"
eerror " cp /etc/conf.d/uwsgi /etc/conf.d/uwsgi.trac"
- eerror " `basename "${EDITOR}"` /etc/conf.d/uwsgi.trac"
+ eerror " nano /etc/conf.d/uwsgi.trac"
eerror
return 1
fi