[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     d3907fc5eaed884dfaf67ef8a6c0bab0c66bb080
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 18:11:58 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> 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 "| | | |  \| | |_) |  _| | |   |  _|   / _ \ \___ \|  _| | | | |"