| 1 |
commit: 19e828fc178f0e55174ae923f6ba9a357fc86885 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 31 22:01:43 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 31 22:01:43 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=19e828fc |
| 7 |
|
| 8 |
Check for desktop-file-validate binary. |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/package/ebuild/doebuild.py | 5 ++++- |
| 12 |
1 files changed, 4 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py |
| 15 |
index dfdfedc..395e0ee 100644 |
| 16 |
--- a/pym/portage/package/ebuild/doebuild.py |
| 17 |
+++ b/pym/portage/package/ebuild/doebuild.py |
| 18 |
@@ -1749,6 +1749,8 @@ def _post_src_install_uid_fix(mysettings, out): |
| 19 |
ed_len = len(mysettings["ED"]) |
| 20 |
desktopfile_errors = [] |
| 21 |
unicode_errors = [] |
| 22 |
+ desktop_file_validate = \ |
| 23 |
+ portage.process.find_binary("desktop-file-validate") is not None |
| 24 |
|
| 25 |
while True: |
| 26 |
|
| 27 |
@@ -1796,7 +1798,8 @@ def _post_src_install_uid_fix(mysettings, out): |
| 28 |
else: |
| 29 |
fpath = os.path.join(parent, fname) |
| 30 |
|
| 31 |
- if fname.endswith(".desktop") and os.path.isfile(fpath): |
| 32 |
+ if desktop_file_validate and fname.endswith(".desktop") and \ |
| 33 |
+ os.path.isfile(fpath): |
| 34 |
desktop_validate = validate_desktop_entry(fpath) |
| 35 |
if desktop_validate: |
| 36 |
desktopfile_errors.extend(desktop_validate) |
Archives