[oe-commits] Martin Jansa : image.bbclass: install_linguas don't install empty list

git version control git at git.openembedded.org
Fri Apr 30 11:46:21 UTC 2010


Module: openembedded.git
Branch: org.openembedded.dev
Commit: e38c2c1286f25518770d6c668dc43939476f312d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e38c2c1286f25518770d6c668dc43939476f312d

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Apr 30 12:34:08 2010 +0200

image.bbclass: install_linguas don't install empty list

* in some combination of IMAGE_LINGUAS installed packages and available translations it's normal to get empty intersection in pending-locale-packages
* don't call opkg install in this case, because it will fail

---

 classes/image.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/classes/image.bbclass b/classes/image.bbclass
index 0fcbc44..614d368 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -260,7 +260,9 @@ if [ -e ${IMAGE_ROOTFS}/usr/bin/opkg-cl ] ; then
 
 	cat /tmp/wanted-locale-packages /tmp/available-locale-packages | sort | uniq -d > /tmp/pending-locale-packages
 
-	cat /tmp/pending-locale-packages | xargs ${OPKG} -nodeps install
+	if [ -s /tmp/pending-locale-packages ] ; then
+		cat /tmp/pending-locale-packages | xargs ${OPKG} -nodeps install
+	fi
 	rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/*
 
     for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.preinst; do





More information about the Openembedded-commits mailing list