From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4BB8C1396D0 for ; Mon, 2 Oct 2017 16:56:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E8592BC00C; Mon, 2 Oct 2017 16:56:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6C4082BC00C for ; Mon, 2 Oct 2017 16:56:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B99F3416C8 for ; Mon, 2 Oct 2017 16:56:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DFEF08F66 for ; Mon, 2 Oct 2017 16:56:31 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1506963381.38deed53c51aa9e75bd8c933f84121af993af7a2.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/postinst-qa-check.d/ X-VCS-Repository: proj/portage X-VCS-Files: bin/postinst-qa-check.d/50gnome2-utils bin/postinst-qa-check.d/50xdg-utils X-VCS-Directories: bin/postinst-qa-check.d/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 38deed53c51aa9e75bd8c933f84121af993af7a2 X-VCS-Branch: master Date: Mon, 2 Oct 2017 16:56:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4bf7c0d3-47c2-440f-aa7c-b1340912b08f X-Archives-Hash: a6524a72aab1fdd36eab96dca33d9fc6 commit: 38deed53c51aa9e75bd8c933f84121af993af7a2 Author: Michał Górny gentoo org> AuthorDate: Mon Oct 2 15:34:21 2017 +0000 Commit: Michał Górny gentoo 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 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