From: Maciej Mrozowski <reavertm@gentoo.org>
Date: Tue, 22 Jun 2010 13:49:08 +0000 (+0000)
Subject: Check whether misc files (README's and such) are actually regular files
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23e38614ab5eb7be35af5eb0d0eb361bc18bf425;p=gentoo.git

Check whether misc files (README's and such) are actually regular files
---

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 284a24290871..d5aef66f6d17 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.62 2010/05/17 01:16:39 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.63 2010/06/22 13:49:08 reavertm Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -726,10 +726,10 @@ kde4-base_src_install() {
 	local doc
 	if ! has kde4-meta ${INHERITED}; then
 		for doc in "${S}"/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do
-			[[ -s "${doc}" ]] && dodoc "${doc}"
+			[[ -f "${doc}" ]] && [[ -s "${doc}" ]] && dodoc "${doc}"
 		done
 		for doc in "${S}"/*/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do
-			[[ -s "${doc}" ]] && newdoc "${doc}" "$(basename $(dirname ${doc})).$(basename ${doc})"
+			[[ -f "${doc}" ]] && [[ -s "${doc}" ]] && newdoc "${doc}" "$(basename $(dirname ${doc})).$(basename ${doc})"
 		done
 	fi
 
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 2d63015382b3..6e2a47eec596 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.37 2010/05/17 01:16:39 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.38 2010/06/22 13:49:08 reavertm Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -714,7 +714,7 @@ kde4-meta_src_install() {
 	# Search ${S}/${KMMODULE} and install common documentation files found
 	local doc
 	for doc in "${S}/${KMMODULE}"/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do
-		[[ -s "${doc}" ]] && dodoc "${doc}"
+		[[ -f "${doc}" ]] && [[ -s "${doc}" ]] && dodoc "${doc}"
 	done
 
 	kde4-base_src_install