Patchwork [3/6] classes/license: remove redundant nested if statements

login
register
mail settings
Submitter Vladimir Zapolskiy
Date Sept. 11, 2012, 1:13 a.m.
Message ID <1347326028-32469-4-git-send-email-vladimir_zapolskiy@mentor.com>
Download mbox | patch
Permalink /patch/36247/
State Accepted
Commit 100e457de4b223defb1a844d3b85af812caf2f79
Headers show

Comments

Vladimir Zapolskiy - Sept. 11, 2012, 1:13 a.m.
Cosmetic change, which improves code perception. Also check for locale
packages firstly, this shall improve performance a little.

Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
---
 meta/classes/license.bbclass |   40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

Patch

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 021ab2e..8fb66be 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -90,26 +90,32 @@  license_create_manifest() {
 		# not the best way to do this but licenses are not arch dependant iirc
 		filename=`ls ${TMPDIR}/pkgdata/*/runtime-reverse/${pkg}| head -1`
 		pkged_pn="$(sed -n 's/^PN: //p' ${filename})"
+
+		# exclude locale recipes
+		if [ "${pkged_pn}" = "*locale*" ]; then
+			continue
+		fi
+
+		# check to see if the package name exists in the manifest. if so, bail.
+		if grep -q "^PACKAGE NAME: ${pkg}" ${LICENSE_MANIFEST}; then
+			continue
+		fi
+
 		pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/  */ /g; p }' ${filename})"
 		pkged_pv="$(sed -n 's/^PV: //p' ${filename})"
-		# check to see if the package name exists in the manifest. if so, bail.
-		if ! grep -q "^PACKAGE NAME: ${pkg}" ${LICENSE_MANIFEST}; then
-			# exclude local recipes
-			if [ ! "${pkged_pn}" = "*locale*" ]; then
-				echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST}
-				echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_MANIFEST}
-				echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_MANIFEST}
-				echo "LICENSE: " >> ${LICENSE_MANIFEST}
-				for lic in ${pkged_lic}; do
-					if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic}" ]; then
-						echo ${lic}|sed s'/generic_//'g >> ${LICENSE_MANIFEST}
-					else
-						echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn} >> ${LICENSE_MANIFEST}
-					fi
-				done
-				echo "" >> ${LICENSE_MANIFEST}
+
+		echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST}
+		echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_MANIFEST}
+		echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_MANIFEST}
+		echo "LICENSE: " >> ${LICENSE_MANIFEST}
+		for lic in ${pkged_lic}; do
+			if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic}" ]; then
+				echo ${lic}|sed s'/generic_//'g >> ${LICENSE_MANIFEST}
+			else
+				echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn} >> ${LICENSE_MANIFEST}
 			fi
-		fi
+		done
+		echo "" >> ${LICENSE_MANIFEST}
 	done
 
 	# Two options here: