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 5593D1381F3 for ; Tue, 13 Aug 2013 15:46:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DBD6E086F; Tue, 13 Aug 2013 15:46:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BEF65E086F for ; Tue, 13 Aug 2013 15:46:52 +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 D66BE33EB30 for ; Tue, 13 Aug 2013 15:46:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 400B5E468F for ; Tue, 13 Aug 2013 15:46:50 +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: <1376408788.4e0c84bf0fd50dcaf88f09b21ab32b13841648ff.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: 4e0c84bf0fd50dcaf88f09b21ab32b13841648ff X-VCS-Branch: master Date: Tue, 13 Aug 2013 15:46:50 +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: f33cbe13-061f-4af4-b64d-e7ce2cf8e1a5 X-Archives-Hash: c108269629dd192f566a17bfd8bd68c1 commit: 4e0c84bf0fd50dcaf88f09b21ab32b13841648ff Author: Zac Medico gentoo org> AuthorDate: Tue Aug 13 15:46:28 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Aug 13 15:46:28 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4e0c84bf validate_desktop_entry: allow OnlyShowIn Pantheon This will fix bug #480586. --- pym/portage/util/_desktop_entry.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pym/portage/util/_desktop_entry.py b/pym/portage/util/_desktop_entry.py index 29e154d..efd2136 100644 --- a/pym/portage/util/_desktop_entry.py +++ b/pym/portage/util/_desktop_entry.py @@ -51,7 +51,7 @@ _ignored_errors = ( 'warning: key "Encoding" in group "Desktop Entry" is deprecated' ) -_NotShowIn_exemptions = ( +_ShowIn_exemptions = ( # See bug #480586. 'contains an unregistered value "Pantheon"', ) @@ -80,9 +80,10 @@ def validate_desktop_entry(path): # "hint:" output is new in desktop-file-utils-0.21 if msg.startswith('hint: ') or msg in _ignored_errors: continue - if 'for key "NotShowIn" in group "Desktop Entry"' in msg: + if 'for key "NotShowIn" in group "Desktop Entry"' in msg or \ + 'for key "OnlyShowIn" in group "Desktop Entry"': exempt = False - for s in _NotShowIn_exemptions: + for s in _ShowIn_exemptions: if s in msg: exempt = True break