From: Michael Palimaka <kensington@gentoo.org>
Date: Thu, 16 Jun 2016 19:31:03 +0000 (+1000)
Subject: kde5-functions: die if too many arguments are passed to add_*_dep
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ab1baddbb30c2e6f8c3120404676355a2cd470d6;p=gentoo.git

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.
---

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index b20d406721dd..a8cc1a344327 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