]> code.ossystems Code Review - openembedded-core.git/commitdiff
license.bbclass: fix unexpected operator for LICENSE values with space
authorMartin Jansa <martin.jansa@gmail.com>
Mon, 24 Aug 2015 17:12:18 +0000 (12:12 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 1 Sep 2015 20:30:26 +0000 (21:30 +0100)
* add quotes around pkged_lic so that it works correctly with spaces
* fixes following error:
  run.license_create_manifest.50601: 193: [: GPLv2: unexpected operator

(From OE-Core rev: 2bb8b2abb689d91b7b7e28e6bd528747bde94dd2)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
meta/classes/license.bbclass

index dfb162d831b03b9e14c68eb68aae5e52e6681af2..8d383caabccc05d595a532dfc3f986d539652307 100644 (file)
@@ -50,7 +50,7 @@ license_create_manifest() {
                pkged_pv="$(sed -n 's/^PV: //p' ${filename})"
                pkged_name="$(basename $(readlink ${filename}))"
                pkged_lic="$(sed -n "/^LICENSE_${pkged_name}: /{ s/^LICENSE_${pkged_name}: //; p }" ${filename})"
-               if [ -z ${pkged_lic} ]; then
+               if [ -z "${pkged_lic}" ]; then
                        # fallback checking value of LICENSE
                        pkged_lic="$(sed -n "/^LICENSE: /{ s/^LICENSE: //; p }" ${filename})"
                fi