From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DA2FE138010 for ; Sun, 28 Oct 2012 19:26:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DD2621C00C; Sun, 28 Oct 2012 19:26:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C35BA21C00C for ; Sun, 28 Oct 2012 19:26:17 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E19E33D87A for ; Sun, 28 Oct 2012 19:26:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 96D43E5436 for ; Sun, 28 Oct 2012 19:26:15 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1351452358.ad24e372f5059dc1d6688e0fd01fb4fdb38f2908.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/util/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/util/_desktop_entry.py X-VCS-Directories: pym/portage/util/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ad24e372f5059dc1d6688e0fd01fb4fdb38f2908 X-VCS-Branch: master Date: Sun, 28 Oct 2012 19:26:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0b3aaf0b-d973-470f-90d2-0bb4a182f3eb X-Archives-Hash: 8029a11193cd243c20a0648b0dda2d58 commit: ad24e372f5059dc1d6688e0fd01fb4fdb38f2908 Author: Zac Medico gentoo org> AuthorDate: Sun Oct 28 19:25:58 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Oct 28 19:25:58 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ad24e372 validate_desktop_entry: handle df-utils-0.21 hint --- pym/portage/util/_desktop_entry.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/pym/portage/util/_desktop_entry.py b/pym/portage/util/_desktop_entry.py index 2973d12..54b0950 100644 --- a/pym/portage/util/_desktop_entry.py +++ b/pym/portage/util/_desktop_entry.py @@ -62,7 +62,9 @@ def validate_desktop_entry(path): if output_lines: filtered_output = [] for line in output_lines: - if line[len(path)+2:] in _ignored_errors: + msg = line[len(path)+2:] + # "hint:" output is new in desktop-file-utils-0.21 + if msg.startswith('hint: ') or msg in _ignored_errors: continue filtered_output.append(line) output_lines = filtered_output