[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michael Palimaka]

commit:     ab1baddbb30c2e6f8c3120404676355a2cd470d6
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 19:31:03 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 18:49:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab1baddb

kde5-functions: die if too many arguments are passed to add_*_dep

This avoids bugs where too many arguments are passed by mistake, causing the
last one to be ignored.

For example, the subslot operator added in 
d1bc5ac3f0e42df0f0255c8b39d7df16c5d4176b
was never applied because too many '' were passed.

 eclass/kde5-functions.eclass | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index b20d406..a8cc1a3 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -141,6 +141,10 @@ _add_category_dep() {
 add_frameworks_dep() {
        debug-print-function ${FUNCNAME} "$@"
 
+       if [[ $# -gt 4 ]]; then
+               die "${FUNCNAME} was called with too many arguments"
+       fi
+
        local version
 
        if [[ -n ${3} ]]; then
@@ -169,6 +173,10 @@ add_frameworks_dep() {
 add_plasma_dep() {
        debug-print-function ${FUNCNAME} "$@"
 
+       if [[ $# -gt 4 ]]; then
+               die "${FUNCNAME} was called with too many arguments"
+       fi
+
        local version
 
        if [[ -n ${3} ]]; then
@@ -197,6 +205,10 @@ add_plasma_dep() {
 add_kdeapps_dep() {
        debug-print-function ${FUNCNAME} "$@"
 
+       if [[ $# -gt 4 ]]; then
+               die "${FUNCNAME} was called with too many arguments"
+       fi
+
        local version
 
        if [[ -n ${3} ]]; then
@@ -230,6 +242,10 @@ add_kdeapps_dep() {
 add_qt_dep() {
        debug-print-function ${FUNCNAME} "$@"
 
+       if [[ $# -gt 4 ]]; then
+               die "${FUNCNAME} was called with too many arguments"
+       fi
+
        local version
 
        if [[ -n ${3} ]]; then