1 |
commit: ad24e372f5059dc1d6688e0fd01fb4fdb38f2908 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 28 19:25:58 2012 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 28 19:25:58 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ad24e372 |
7 |
|
8 |
validate_desktop_entry: handle df-utils-0.21 hint |
9 |
|
10 |
--- |
11 |
pym/portage/util/_desktop_entry.py | 4 +++- |
12 |
1 files changed, 3 insertions(+), 1 deletions(-) |
13 |
|
14 |
diff --git a/pym/portage/util/_desktop_entry.py b/pym/portage/util/_desktop_entry.py |
15 |
index 2973d12..54b0950 100644 |
16 |
--- a/pym/portage/util/_desktop_entry.py |
17 |
+++ b/pym/portage/util/_desktop_entry.py |
18 |
@@ -62,7 +62,9 @@ def validate_desktop_entry(path): |
19 |
if output_lines: |
20 |
filtered_output = [] |
21 |
for line in output_lines: |
22 |
- if line[len(path)+2:] in _ignored_errors: |
23 |
+ msg = line[len(path)+2:] |
24 |
+ # "hint:" output is new in desktop-file-utils-0.21 |
25 |
+ if msg.startswith('hint: ') or msg in _ignored_errors: |
26 |
continue |
27 |
filtered_output.append(line) |
28 |
output_lines = filtered_output |