public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:master commit in: bin/postinst-qa-check.d/
Date: Mon,  2 Oct 2017 16:56:31 +0000 (UTC)	[thread overview]
Message-ID: <1506963381.38deed53c51aa9e75bd8c933f84121af993af7a2.mgorny@gentoo> (raw)

commit:     38deed53c51aa9e75bd8c933f84121af993af7a2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  2 15:34:21 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct  2 16:56:21 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=38deed53

postinst-qa-check.d: Skip checks if required tools are missing

Closes: https://bugs.gentoo.org/631820
Reviewed-by: Zac Medico <zmedico <AT> gentoo.org>

 bin/postinst-qa-check.d/50gnome2-utils | 2 ++
 bin/postinst-qa-check.d/50xdg-utils    | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/bin/postinst-qa-check.d/50gnome2-utils b/bin/postinst-qa-check.d/50gnome2-utils
index 569633fe3..7f1b0b847 100644
--- a/bin/postinst-qa-check.d/50gnome2-utils
+++ b/bin/postinst-qa-check.d/50gnome2-utils
@@ -1,6 +1,8 @@
 # check for missing calls to gnome2-utils regen functions
 
 gnome2_icon_cache_check() {
+	type -P gtk-update-icon-cache &>/dev/null || return
+
 	local d f all_files=() missing
 	for d in usr/share/icons/*/; do
 		# gnome2_icon_cache_update updates only themes with an index

diff --git a/bin/postinst-qa-check.d/50xdg-utils b/bin/postinst-qa-check.d/50xdg-utils
index 9164f8dc1..9f5ae7cb9 100644
--- a/bin/postinst-qa-check.d/50xdg-utils
+++ b/bin/postinst-qa-check.d/50xdg-utils
@@ -1,6 +1,8 @@
 # check for missing calls to xdg-utils regen functions
 
 xdg_desktop_database_check() {
+	type -P update-desktop-database &>/dev/null || return
+
 	local d f missing
 	for d in usr/share/applications; do
 		[[ -d ${d} ]] || continue
@@ -39,6 +41,8 @@ xdg_desktop_database_check() {
 }
 
 xdg_mimeinfo_database_check() {
+	type -P update-mime-database &>/dev/null || return
+
 	local d f missing
 	for d in usr/share/mime; do
 		[[ -d ${d} ]] || continue


             reply	other threads:[~2017-10-02 16:56 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-02 16:56 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-02-12 23:38 [gentoo-commits] proj/portage:master commit in: bin/postinst-qa-check.d/ Zac Medico
2019-02-12 23:38 Zac Medico
2018-03-16  9:27 Zac Medico
2017-10-27 19:11 Zac Medico
2017-10-02 17:28 Zac Medico
2017-09-20 18:14 Zac Medico
2017-09-20  4:28 Zac Medico
2017-09-19 23:38 Zac Medico
2017-09-19 23:38 Zac Medico
2017-08-29 16:38 Michał Górny
2017-08-26 21:16 Michał Górny
2017-08-26 21:16 Michał Górny
2017-08-26 21:16 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1506963381.38deed53c51aa9e75bd8c933f84121af993af7a2.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox