diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-07-31 15:01:43 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-07-31 15:01:43 -0700 |
| commit | 19e828fc178f0e55174ae923f6ba9a357fc86885 (patch) | |
| tree | 88f4df194cf00594276d4401ef1bf724a6884da9 /pym | |
| parent | 3836d4ec2da708677826cda1d3ea9f8281bde9c7 (diff) | |
| download | portage-19e828fc178f0e55174ae923f6ba9a357fc86885.tar.gz portage-19e828fc178f0e55174ae923f6ba9a357fc86885.tar.bz2 portage-19e828fc178f0e55174ae923f6ba9a357fc86885.zip | |
Check for desktop-file-validate binary.
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index dfdfedcbd..395e0eeec 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -1749,6 +1749,8 @@ def _post_src_install_uid_fix(mysettings, out): ed_len = len(mysettings["ED"]) desktopfile_errors = [] unicode_errors = [] + desktop_file_validate = \ + portage.process.find_binary("desktop-file-validate") is not None while True: @@ -1796,7 +1798,8 @@ def _post_src_install_uid_fix(mysettings, out): else: fpath = os.path.join(parent, fname) - if fname.endswith(".desktop") and os.path.isfile(fpath): + if desktop_file_validate and fname.endswith(".desktop") and \ + os.path.isfile(fpath): desktop_validate = validate_desktop_entry(fpath) if desktop_validate: desktopfile_errors.extend(desktop_validate) |