From 92e2478918074a3491c28c2af37c4511fb8791ce Mon Sep 17 00:00:00 2001 From: Carsten Lohrke Date: Sun, 22 Apr 2007 15:55:07 +0000 Subject: [PATCH] validate_desktop_entries: don't process entries twice, condense information a bit --- eclass/eutils.eclass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 905463931d6c..7a7e98ca9831 100644 --- 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 # # 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 -- 2.26.2