From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 13 Aug 2013 15:46:28 +0000 (-0700)
Subject: validate_desktop_entry: allow OnlyShowIn Pantheon
X-Git-Tag: v2.2.1~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4e0c84bf0fd50dcaf88f09b21ab32b13841648ff;p=portage.git

validate_desktop_entry: allow OnlyShowIn Pantheon

This will fix bug #480586.
---

diff --git a/pym/portage/util/_desktop_entry.py b/pym/portage/util/_desktop_entry.py
index 29e154d15..efd213671 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