From: Ed Bartosh Date: Fri, 14 Jul 2017 12:33:03 +0000 (+0300) Subject: wic: isoimage-isohybrid: check result of glob() X-Git-Tag: uninative-1.7~192 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ad02f253f08a3da3fa5c86ae4f6ba7f94b070578;p=openembedded-core.git wic: isoimage-isohybrid: check result of glob() isoimage-isohybrid plugin uses result of glob call to get path to initrd image. When glob returns empty list the plugin crashes with IndexError. Checking if result of glob call is not empty should fix the breakage. Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton --- diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index ffa5429962..ece4b0c19e 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py @@ -164,9 +164,12 @@ class IsoImagePlugin(SourcePlugin): machine = os.path.basename(initrd_dir) - initrd = glob.glob('%s/%s*%s.%s' % (initrd_dir, image_name, machine, image_type))[0] + pattern = '%s/%s*%s.%s' % (initrd_dir, image_name, machine, image_type) + files = glob.glob(pattern) + if files: + initrd = files[0] - if not os.path.exists(initrd): + if not initrd or not os.path.exists(initrd): # Create initrd from rootfs directory initrd = "%s/initrd.cpio.gz" % cr_workdir initrd_dir = "%s/INITRD" % cr_workdir