validate_desktop_entries: don't process entries twice, condense information a bit

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 905463931d6cd55bd89edeec3ae2d4742c8c20a0..7a7e98ca9831c163f30c728c073f1b94c8636b4f 100644 (file)
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.277 2007/04/06 11:43:30 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.278 2007/04/22 15:55:07 carlo Exp $
 #
 # This eclass is for general purpose functions that most ebuilds
 # have to implement themselves.
@@ -920,7 +920,7 @@ make_desktop_entry() {
 }
 
 
-# Validatedesktop entries using desktop-file-utils
+# Validate desktop entries using desktop-file-utils
 # Carsten Lohrke <carlo@gentoo.org>
 #
 # Usage: validate_desktop_entries [directory ...]
@@ -933,10 +933,11 @@ validate_desktop_entries() {
                        directories="${directories} ${D}${d}"
                done
                for FILE in $(find ${D}/usr/share/applications ${directories} -name "*\.desktop" \
-                       -not -path '*.hidden*' 2>/dev/null)
+                       -not -path '*.hidden*' | sort -u 2>/dev/null)
                do
-                       local temp=$(desktop-file-validate ${FILE} | grep -v "warning:")
-                       [[ -n $temp ]] && elog ${temp//${D}/}
+                       local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
+                                               sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
+                       [[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
                done
                echo ""
        else