From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 12DFC1397EC for ; Wed, 19 Aug 2015 18:12:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ABA6B1422E; Wed, 19 Aug 2015 18:12:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F8B91422E for ; Wed, 19 Aug 2015 18:12:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B1E5340905 for ; Wed, 19 Aug 2015 18:12:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3122B15A for ; Wed, 19 Aug 2015 18:12:34 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1440007942.d3907fc5eaed884dfaf67ef8a6c0bab0c66bb080.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: d3907fc5eaed884dfaf67ef8a6c0bab0c66bb080 X-VCS-Branch: master Date: Wed, 19 Aug 2015 18:12:34 +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: af33518c-2330-4761-af87-1d57824ee631 X-Archives-Hash: 57523d2ea7f6126bbedbb3c908e0a5f6 commit: d3907fc5eaed884dfaf67ef8a6c0bab0c66bb080 Author: Michael Palimaka gentoo org> AuthorDate: Wed Aug 19 18:11:58 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Aug 19 18:12:22 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d3907fc5 eclass: don't warn on regular fetch failure pkg_nofetch is called if fetch fails for any reason, not just if the package is fetch-restricted. eclass/kde5.eclass | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 1b3b84c..94bacf9 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -216,6 +216,17 @@ if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KDE_BUILD_TYPE} = release ]]; then S=${WORKDIR}/${KMNAME}-${PV} fi +_kde_is_unreleased() { + local pair + for pair in "${KDE_UNRELEASED[@]}" ; do + if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then + return 0 + fi + done + + return 1 +} + # Determine fetch location for released tarballs _calculate_src_uri() { debug-print-function ${FUNCNAME} "$@" @@ -269,12 +280,9 @@ _calculate_src_uri() { ;; esac - local pair - for pair in "${KDE_UNRELEASED[@]}" ; do - if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then - RESTRICT+=" fetch" - fi - done + if _kde_is_unreleased ; then + RESTRICT+=" fetch" + fi } # Determine fetch location for live sources @@ -373,6 +381,10 @@ kde5_pkg_setup() { # @DESCRIPTION: # Display package publication status kde5_pkg_nofetch() { + if ! _kde_is_unreleased ; then + return + fi + eerror " _ _ _ _ ____ _____ _ _____ _ ____ _____ ____ " eerror "| | | | \ | | _ \| ____| | | ____| / \ / ___|| ____| _ \ " eerror "| | | | \| | |_) | _| | | | _| / _ \ \___ \| _| | | | |"