| 1 |
ulm 13/03/05 22:28:41 |
| 2 |
|
| 3 |
Modified: readme.gentoo.eclass |
| 4 |
Log: |
| 5 |
Suppress trailing whitespace in README.gentoo file, bug 460050 comment #7. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.5 eclass/readme.gentoo.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.5&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.5&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?r1=1.4&r2=1.5 |
| 13 |
|
| 14 |
Index: readme.gentoo.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v |
| 17 |
retrieving revision 1.4 |
| 18 |
retrieving revision 1.5 |
| 19 |
diff -u -r1.4 -r1.5 |
| 20 |
--- readme.gentoo.eclass 3 Mar 2013 12:05:08 -0000 1.4 |
| 21 |
+++ readme.gentoo.eclass 5 Mar 2013 22:28:41 -0000 1.5 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2013 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.4 2013/03/03 12:05:08 pacho Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.5 2013/03/05 22:28:41 ulm Exp $ |
| 27 |
|
| 28 |
# @ECLASS: readme.gentoo |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -10,7 +10,7 @@ |
| 31 |
# @BLURB: An eclass for installing a README.gentoo doc file recording tips |
| 32 |
# shown via elog messages. |
| 33 |
# @DESCRIPTION: |
| 34 |
-# An eclass for installing a README.gentoo doc file recording tips |
| 35 |
+# An eclass for installing a README.gentoo doc file recording tips |
| 36 |
# shown via elog messages. With this eclass, those elog messages will only be |
| 37 |
# shown at first package installation and a file for later reviewing will be |
| 38 |
# installed under /usr/share/doc/${PF} |
| 39 |
@@ -40,7 +40,7 @@ |
| 40 |
# @DEFAULT_UNSET |
| 41 |
# @DESCRIPTION: |
| 42 |
# If non-empty, DOC_CONTENTS information will be strictly respected, |
| 43 |
-# not getting it automatically formatted by fmt. If empty, it will |
| 44 |
+# not getting it automatically formatted by fmt. If empty, it will |
| 45 |
# rely on fmt for formatting and 'echo -e' options to tweak lines a bit. |
| 46 |
|
| 47 |
# @ECLASS-VARIABLE: FORCE_PRINT_ELOG |
| 48 |
@@ -51,7 +51,7 @@ |
| 49 |
# @FUNCTION: readme.gentoo_create_doc |
| 50 |
# @DESCRIPTION: |
| 51 |
# Create doc file with ${DOC_CONTENTS} variable (preferred) and, if not set, |
| 52 |
-# look for "${FILESDIR}/README.gentoo" contents. You can use |
| 53 |
+# look for "${FILESDIR}/README.gentoo" contents. You can use |
| 54 |
# ${FILESDIR}/README.gentoo-${SLOT} also. |
| 55 |
# Usually called at src_install phase. |
| 56 |
readme.gentoo_create_doc() { |
| 57 |
@@ -63,7 +63,8 @@ |
| 58 |
if [[ -n "${DISABLE_AUTOFORMATTING}" ]]; then |
| 59 |
echo "${DOC_CONTENTS}" > "${T}"/README.gentoo |
| 60 |
else |
| 61 |
- echo -e ${DOC_CONTENTS} | fold -s -w 70 > "${T}"/README.gentoo |
| 62 |
+ echo -e ${DOC_CONTENTS} | fold -s -w 70 \ |
| 63 |
+ | sed 's/[[:space:]]*$//' > "${T}"/README.gentoo |
| 64 |
fi |
| 65 |
eshopts_pop |
| 66 |
elif [[ -f "${FILESDIR}/README.gentoo-${SLOT%/*}" ]]; then |
Archives