[oe-commits] Vladimir Zapolskiy : classes/license: place all found licenses on one line

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: f015a9eb8265c485da0b20009ba72119035599b1
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f015a9eb8265c485da0b20009ba72119035599b1

Author: Vladimir Zapolskiy <vladimir_zapolskiy at mentor.com>
Date:   Tue Sep 11 04:51:01 2012 +0300

classes/license: place all found licenses on one line

Cosmetic change, settle all found licenses into one line and report warning
about missing licenses loudly.

Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy at mentor.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/classes/license.bbclass |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 4b5954d..29fe938 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -112,16 +112,16 @@ license_create_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}
+		echo -n "LICENSE:" >> ${LICENSE_MANIFEST}
 		for lic in ${pkged_lic}; do
 			# to reference a license file trim trailing + symbol
 			if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then
-				echo ${lic} >> ${LICENSE_MANIFEST}
+				echo -n " ${lic}" >> ${LICENSE_MANIFEST}
 			else
-				echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn} >> ${LICENSE_MANIFEST}
+				echo "WARNING: The license listed ${lic} was not in the licenses collected for ${pkged_pn}"
 			fi
 		done
-		echo "" >> ${LICENSE_MANIFEST}
+		echo -e "\n" >> ${LICENSE_MANIFEST}
 	done
 
 	# Two options here: