Skip to contentSkip to conversation

base-files: Avoid problems if DISTRO_VERSION contains undefined variable

PATCH New Peter Kjellerstedt 1 participant 1 message Jan 18, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 base-files: Avoid problems if DISTRO_VERSION contains undefined variable

If DISTRO_VERSION is defined to some undefined variable, e.g., DISTRO_VERSION = "${FOO_VERSION}", and /bin/sh is dash, then do_install() would fail with an error such as:

run.do_install.2945:193: run.do_install.2945: Syntax error:
Unterminated quoted string

This was due to unexpanded Python code making it into the shell code, confusing the shell parser.

---
 meta/recipes-core/base-files/base-files_3.0.14.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/base-files/base-files_3.0.14.bb +1 -1
index 6e30c149ba..f42a4ef7c4 100644
@@ -150,7 +150,7 @@ do_install_basefilesissue () {
 		printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue
 		printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net
 		if [ -n "${DISTRO_VERSION}" ]; then
-			distro_version_nodate=${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot').replace('${DATE}','')}
+			distro_version_nodate="${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}','snapshot').replace('${DATE}','')}"
 			printf "%s " $distro_version_nodate >> ${D}${sysconfdir}/issue
 			printf "%s " $distro_version_nodate >> ${D}${sysconfdir}/issue.net
 		fi
Signature · 1 line
2.12.0