diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-07-14 15:33:03 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-17 13:48:54 +0100 |
| commit | ad02f253f08a3da3fa5c86ae4f6ba7f94b070578 (patch) | |
| tree | 853ff3eb56c33f3933d2dcca885709b40e4bdd44 /scripts/lib/wic | |
| parent | 522ac21831944b06fbcc372ac61762576d792c22 (diff) | |
| download | openembedded-core-contrib-ad02f253f08a3da3fa5c86ae4f6ba7f94b070578.tar.gz | |
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 <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/lib/wic')
| -rw-r--r-- | scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 7 |
1 files changed, 5 insertions, 2 deletions
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 |