From 1e8e2e78a599af9504847aa86ed37bb06be1ee9d Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 18 Nov 2013 14:02:11 +0000 Subject: [PATCH] * tests/util/grub-shell.in: Don't fail on emu platform if po/*.gmo files have not been built. --- ChangeLog | 5 +++++ tests/util/grub-shell.in | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fec4dc731..2c43f6a9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-11-18 Colin Watson + + * tests/util/grub-shell.in: Don't fail on emu platform if po/*.gmo + files have not been built. + 2013-11-18 Colin Watson * grub-core/osdep/unix/hostdisk.c (grub_util_make_temporary_file): diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in index b0081cb7f..b3632a883 100644 --- a/tests/util/grub-shell.in +++ b/tests/util/grub-shell.in @@ -434,7 +434,11 @@ elif [ x$boot = xemu ]; then mkdir -p "$grubdir/locale" cp "@builddir@/"unicode.pf2 "$grubdir/fonts/unicode.pf2" cp -R "@srcdir@/themes/starfield" "$grubdir/themes/starfield" - cp -R "@srcdir@/po/"*.gmo "$grubdir/locale/" + for file in "@srcdir@/po/"*.gmo; do + if [ -f "$file" ]; then + cp "$file" "$grubdir/locale/" + fi + done cp "${cfgfile}" "$grubdir/grub.cfg" cp "${source}" "$grubdir/testcase.cfg" @builddir@/grub-core/grub-emu -m "$device_map" -d "$grubdir" | tr -d "\r" | do_trim